Merge branch 'nd/error-errno'
The code for warning_errno/die_errno has been refactored and a new error_errno() reporting helper is introduced. * nd/error-errno: (41 commits) wrapper.c: use warning_errno() vcs-svn: use error_errno() upload-pack.c: use error_errno() unpack-trees.c: use error_errno() transport-helper.c: use error_errno() sha1_file.c: use {error,die,warning}_errno() server-info.c: use error_errno() sequencer.c: use error_errno() run-command.c: use error_errno() rerere.c: use error_errno() and warning_errno() reachable.c: use error_errno() mailmap.c: use error_errno() ident.c: use warning_errno() http.c: use error_errno() and warning_errno() grep.c: use error_errno() gpg-interface.c: use error_errno() fast-import.c: use error_errno() entry.c: use error_errno() editor.c: use error_errno() diff-no-index.c: use error_errno() ...
This commit is contained in:
10
http.c
10
http.c
@ -460,8 +460,7 @@ static int sockopt_callback(void *client, curl_socket_t fd, curlsocktype type)
|
||||
|
||||
rc = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&ka, len);
|
||||
if (rc < 0)
|
||||
warning("unable to set SO_KEEPALIVE on socket %s",
|
||||
strerror(errno));
|
||||
warning_errno("unable to set SO_KEEPALIVE on socket");
|
||||
|
||||
return 0; /* CURL_SOCKOPT_OK only exists since curl 7.21.5 */
|
||||
}
|
||||
@ -1923,8 +1922,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
|
||||
}
|
||||
|
||||
if (freq->localfile < 0) {
|
||||
error("Couldn't create temporary file %s: %s",
|
||||
freq->tmpfile, strerror(errno));
|
||||
error_errno("Couldn't create temporary file %s", freq->tmpfile);
|
||||
goto abort;
|
||||
}
|
||||
|
||||
@ -1969,8 +1967,8 @@ struct http_object_request *new_http_object_request(const char *base_url,
|
||||
prev_posn = 0;
|
||||
lseek(freq->localfile, 0, SEEK_SET);
|
||||
if (ftruncate(freq->localfile, 0) < 0) {
|
||||
error("Couldn't truncate temporary file %s: %s",
|
||||
freq->tmpfile, strerror(errno));
|
||||
error_errno("Couldn't truncate temporary file %s",
|
||||
freq->tmpfile);
|
||||
goto abort;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user