{"thread":{"id":"31335","subject":"[PATCH] vcs-svn: Fix 'fa/remote-svn' and 'fa/vcs-svn' in pu","startedAt":"2012-08-23T17:55:39Z","lastAt":"2012-08-30T17:28:36Z","messageCount":3,"participants":["Ramsay Jones","Florian Achleitner"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"197726","messageId":"50366E9B.7040803@ramsay1.demon.co.uk","threadId":"31335","inReplyTo":null,"subject":"[PATCH] vcs-svn: Fix 'fa/remote-svn' and 'fa/vcs-svn' in pu","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2012-08-23T17:55:39Z","receivedAt":"2012-08-23T17:55:39Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\n\nSigned-off-by: Ramsay Jones \n---\n\nHi Florian,\n\nThe build on pu is currently broken:\n\n CC remote-testsvn.o\n LINK git-remote-testsvn\n cc: vcs-svn/lib.a: No such file or directory\n make: *** [git-remote-testsvn] Error 1\n\nThis is caused by a dependency missing from the git-remote-testsvn\nlink rule. The addition of the $(VCSSVN_LIB) dependency, which should\nbe squashed into commit ea1f4afb (\"Add git-remote-testsvn to Makefile\",\n20-08-2012), fixes the build.\n\nHowever, this leads to a failure of test t9020.5 and (not unrelated)\ncompiler warnings:\n\n CC vcs-svn/svndump.o\n vcs-svn/svndump.c: In function ‘handle_node’:\n vcs-svn/svndump.c:246: warning: left shift count >= width of type\n vcs-svn/svndump.c:345: warning: format ‘%lu’ expects type ‘long \\\n unsigned int’, but argument 3 has type ‘uintmax_t’\n\nThe fix for the shift count warning is to cast the lhs of the shift\nexpression to uintmax_t. The format warning is fixed by using the\nPRIuMAX format macro. These fixes should be squashed into commit\n78d9d4138 (\"vcs-svn/svndump: rewrite handle_node(), begin|end_revision()\",\n20-08-2012).\n\nHTH\n\nATB,\nRamsay Jones\n\n Makefile | 2 +-\n vcs-svn/svndump.c | 4 ++--\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex 9cede84..761ae05 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2356,7 +2356,7 @@ git-http-push$X: revision.o http.o http-push.o GIT-LDFLAGS $(GITLIBS)\n \t$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \\\n \t\t$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)\n \n-git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS)\n+git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)\n \t$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \\\n \t$(VCSSVN_LIB)\n \ndiff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c\nindex 28ce2aa..eb97e8e 100644\n--- a/vcs-svn/svndump.c\n+++ b/vcs-svn/svndump.c\n@@ -243,7 +243,7 @@ static void handle_node(struct node_ctx_t *node)\n \tconst char *old_data = NULL;\n \tuint32_t old_mode = REPO_MODE_BLB;\n \tstruct strbuf sb = STRBUF_INIT;\n-\tstatic uintmax_t blobmark = 1UL << (bitsizeof(uintmax_t) - 1);\n+\tstatic uintmax_t blobmark = (uintmax_t) 1UL << (bitsizeof(uintmax_t) - 1);\n \n \n \tif (have_text && type == REPO_MODE_DIR)\n@@ -342,7 +342,7 @@ static void handle_node(struct node_ctx_t *node)\n \t\t\t\t\t\tnode->text_length, &input);\n \t\t\t}\n \n-\t\t\tstrbuf_addf(&sb, \":%lu\", blobmark);\n+\t\t\tstrbuf_addf(&sb, \":%\"PRIuMAX, blobmark);\n \t\t\tnode->dataref = sb.buf;\n \t\t}\n \t}\n-- \n1.7.12\n"},{"id":"197889","messageId":"22437025.vxzLHcuBYA@flomedio","threadId":"31335","inReplyTo":"50366E9B.7040803@ramsay1.demon.co.uk","subject":"Re: [PATCH] vcs-svn: Fix 'fa/remote-svn' and 'fa/vcs-svn' in pu","fromName":"Florian Achleitner","fromEmail":"florian.achleitner2.6.31@gmail.com","sentAt":"2012-08-27T07:44:08Z","receivedAt":"2012-08-27T07:44:08Z","isPatch":true,"sender":{"key":"florian.achleitner.2.6.31@gmail.com","avatar":"https://avatars.githubusercontent.com/u/880777?v=4"},"body":"Hi!\n\nThanks for your fixups. I'm currently integrating them in a new series.\nOn what platform did you find that problems? \nTried to reproduce them on 64bit Linux. Anyways the fixes look very reasonable.\n\nFlorian\n\nOn Thursday 23 August 2012 18:55:39 Ramsay Jones wrote:\n> Signed-off-by: Ramsay Jones \n> ---\n> \n> Hi Florian,\n> \n> The build on pu is currently broken:\n> \n> CC remote-testsvn.o\n> LINK git-remote-testsvn\n> cc: vcs-svn/lib.a: No such file or directory\n> make: *** [git-remote-testsvn] Error 1\n> \n> This is caused by a dependency missing from the git-remote-testsvn\n> link rule. The addition of the $(VCSSVN_LIB) dependency, which should\n> be squashed into commit ea1f4afb (\"Add git-remote-testsvn to Makefile\",\n> 20-08-2012), fixes the build.\n> \n> However, this leads to a failure of test t9020.5 and (not unrelated)\n> compiler warnings:\n> \n> CC vcs-svn/svndump.o\n> vcs-svn/svndump.c: In function ‘handle_node’:\n> vcs-svn/svndump.c:246: warning: left shift count >= width of type\n> vcs-svn/svndump.c:345: warning: format ‘%lu’ expects type ‘long \\\n> unsigned int’, but argument 3 has type ‘uintmax_t’\n> \n> The fix for the shift count warning is to cast the lhs of the shift\n> expression to uintmax_t. The format warning is fixed by using the\n> PRIuMAX format macro. These fixes should be squashed into commit\n> 78d9d4138 (\"vcs-svn/svndump: rewrite handle_node(), begin|end_revision()\",\n> 20-08-2012).\n> \n> HTH\n> \n> ATB,\n> Ramsay Jones\n> \n> Makefile | 2 +-\n> vcs-svn/svndump.c | 4 ++--\n> 2 files changed, 3 insertions(+), 3 deletions(-)\n> \n> diff --git a/Makefile b/Makefile\n> index 9cede84..761ae05 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -2356,7 +2356,7 @@ git-http-push$X: revision.o http.o http-push.o\n> GIT-LDFLAGS $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@\n> $(ALL_LDFLAGS) $(filter %.o,$^) \\ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)\n> \n> -git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS)\n> +git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)\n> $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^)\n> $(LIBS) \\ $(VCSSVN_LIB)\n> \n> diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c\n> index 28ce2aa..eb97e8e 100644\n> --- a/vcs-svn/svndump.c\n> +++ b/vcs-svn/svndump.c\n> @@ -243,7 +243,7 @@ static void handle_node(struct node_ctx_t *node)\n> \tconst char *old_data = NULL;\n> \tuint32_t old_mode = REPO_MODE_BLB;\n> \tstruct strbuf sb = STRBUF_INIT;\n> -\tstatic uintmax_t blobmark = 1UL << (bitsizeof(uintmax_t) - 1);\n> +\tstatic uintmax_t blobmark = (uintmax_t) 1UL << (bitsizeof(uintmax_t) - 1);\n> \n> \n> \tif (have_text && type == REPO_MODE_DIR)\n> @@ -342,7 +342,7 @@ static void handle_node(struct node_ctx_t *node)\n> \t\t\t\t\t\tnode->text_length, &input);\n> \t\t\t}\n> \n> -\t\t\tstrbuf_addf(&sb, \":%lu\", blobmark);\n> +\t\t\tstrbuf_addf(&sb, \":%\"PRIuMAX, blobmark);\n> \t\t\tnode->dataref = sb.buf;\n> \t\t}\n> \t}\n"},{"id":"198118","messageId":"503FA2C4.5020308@ramsay1.demon.co.uk","threadId":"31335","inReplyTo":"22437025.vxzLHcuBYA@flomedio","subject":"Re: [PATCH] vcs-svn: Fix 'fa/remote-svn' and 'fa/vcs-svn' in pu","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2012-08-30T17:28:36Z","receivedAt":"2012-08-30T17:28:36Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"Florian Achleitner wrote:\n> Hi!\n> \n> Thanks for your fixups. I'm currently integrating them in a new series.\n> On what platform did you find that problems? \n> Tried to reproduce them on 64bit Linux. Anyways the fixes look very reasonable.\n\nI found the problem on Linux, cygwin and MinGW. That would be *32-bit* Linux,\ncygwin and MinGW, of course. ;-)\n\nATB,\nRamsay Jones\n"}]}