From: Dan McGregor <dan.mcgregor@usask.ca>
To: git@vger.kernel.org
Cc: masayasuzuki@google.com, Dan McGregor <dan.mcgregor@usask.ca>
Subject: [PATCH] http: cast result to FILE *
Date: Fri, 1 Feb 2019 13:30:04 -0600 [thread overview]
Message-ID: <20190201193004.88736-1-dan.mcgregor@usask.ca> (raw)
Commit 8dd2e88a92 ("http: support file handles for HTTP_KEEP_ERROR",
2019-01-10) introduced an implicit assumption that rewind, fileno, and
fflush are functions. At least on FreeBSD fileno is not, and as such
passing a void * failed.
Explicitly cast result to a FILE * when using standard functions that
may ultimately be macros.
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
http.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/http.c b/http.c
index 954bebf684..8b9476b151 100644
--- a/http.c
+++ b/http.c
@@ -1996,12 +1996,12 @@ static int http_request_reauth(const char *url,
strbuf_reset(result);
break;
case HTTP_REQUEST_FILE:
- if (fflush(result)) {
+ if (fflush((FILE *)result)) {
error_errno("unable to flush a file");
return HTTP_START_FAILED;
}
- rewind(result);
- if (ftruncate(fileno(result), 0) < 0) {
+ rewind((FILE *)result);
+ if (ftruncate(fileno((FILE *)result), 0) < 0) {
error_errno("unable to truncate a file");
return HTTP_START_FAILED;
}
--
2.20.1
next reply other threads:[~2019-02-01 19:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 19:30 Dan McGregor [this message]
2019-02-01 21:17 ` [PATCH] http: cast result to FILE * Junio C Hamano
2019-02-02 11:21 ` Duy Nguyen
2019-02-04 11:44 ` Johannes Schindelin
2019-02-04 12:13 ` Duy Nguyen
2019-02-04 18:10 ` Junio C Hamano
2019-02-05 1:36 ` Dan McGregor
2019-02-09 2:36 ` [PATCH v2] git-compat-util: undefine fileno if defined Dan McGregor
2019-02-09 18:34 ` Junio C Hamano
2019-02-12 13:45 ` Duy Nguyen
2019-02-12 14:14 ` Duy Nguyen
2019-02-12 16:56 ` Junio C Hamano
2019-02-16 2:33 ` Dan McGregor
2019-05-08 7:46 ` Junio C Hamano
2019-05-08 10:09 ` Duy Nguyen
2019-05-08 10:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190201193004.88736-1-dan.mcgregor@usask.ca \
--to=dan.mcgregor@usask.ca \
--cc=git@vger.kernel.org \
--cc=masayasuzuki@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).