Re: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c
- From
Stepan Kasal <kasal@ucw.cz>
- Date
- Apr 30, 2014, 22:17 UTC
- Message-ID
- <20140430221728.GA27914@camelia.ucw.cz>
- In-Reply-To
- <5360B5EC.1070907@gmail.com>
Hello,
On Wed, Apr 30, 2014 at 10:35:56AM +0200, Karsten Blees wrote:
Show 5 quoted lines
> Would you mind cross checking your changes with the msysgit fork? > [...] > See https://github.com/msysgit/git/commit/9206e7fd (squashed from > https://github.com/msysgit/git/commit/0115ef83 and > https://github.com/msysgit/git/commit/6949537a).
OK, I _did_ checked these, let's look at the two original commits:
- 0115ef83 is interesting, but not relevant to the warnings, - 6949537a contains a fix for the const warning, plus it fixed a minor nit in the other commit.
> [...] you to come up with an > alternate solution for something that's long been fixed).
Long been fixed by a quick and dirty hack. Marat's fix is nicer, can I ask some of the msysGit guys to ack it? (Appended below for the new cc's here.)
Have a nice day, Stepan
PS: I bet Dscho will be able to handle the conflict.
From: Marat Radchenko <marat@slonopotamus.org> Subject: [PATCH 08/12] MINGW: fix main() signature in http-fetch.c and remote-curl.c Date: Tue, 29 Apr 2014 13:12:02 +0400
On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function. Fix `warning: passing argument 2 of 'mingw_main' from incompatible pointer type` in http-fetch.c and remote-curl.c by dropping 'const'.
Signed-off-by: Marat Radchenko <marat@slonopotamus.org> --- http-fetch.c | 5 +++-- remote-curl.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/http-fetch.c b/http-fetch.c index ba3ea10..a6a9a2f 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -6,7 +6,7 @@ static const char http_fetch_usage[] = "git http-fetch " "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url"; -int main(int argc, const char **argv) +int main(int argc, char **argv) { struct walker *walker; int commits_on_stdin = 0; @@ -38,7 +38,8 @@ int main(int argc, const char **argv) } else if (argv[arg][1] == 'v') { get_verbosely = 1; } else if (argv[arg][1] == 'w') { - write_ref = &argv[arg + 1]; + const char *ref = argv[arg + 1]; + write_ref = &ref; arg++; } else if (argv[arg][1] == 'h') { usage(http_fetch_usage); diff --git a/remote-curl.c b/remote-curl.c index 52c2d96..565b6c9 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -938,7 +938,7 @@ static void parse_push(struct strbuf *buf) free(specs); } -int main(int argc, const char **argv) +int main(int argc, char **argv) { struct strbuf buf = STRBUF_INIT; int nongit;
-- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "msysGit" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.