{"thread":{"id":"47920","subject":"[PATCH] commit-graph: fix some \"plain integer as NULL pointer\" warnings","startedAt":"2018-02-24T02:24:19Z","lastAt":"2018-02-26T14:31:45Z","messageCount":3,"participants":["Ramsay Jones","René Scharfe","Derrick Stolee"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"340147","messageId":"e0bc5fe0-3b32-bebf-11cd-e335a8cf4e1c@ramsayjones.plus.com","threadId":"47920","inReplyTo":null,"subject":"[PATCH] commit-graph: fix some \"plain integer as NULL pointer\" warnings","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2018-02-24T02:24:11Z","receivedAt":"2018-02-24T02:24:19Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSigned-off-by: Ramsay Jones \n---\n\nHi Derrick,\n\nIf you need to re-roll your 'ds/commit-graph' branch, could you\nplease squash this into the relevant patches (corresponding to\ncommits 0fd2d95ee6 [\"commit-graph: implement --set-latest\"],\na33b9b79ff [\"commit-graph: implement --delete-expired\"] and finally\ncommit b534f9e961 [\"commit-graph: implement git commit-graph read\"]).\n\nAlso, I note that two symbols are only used in commit-graph.c but\nare declared extern. Namely 'commit_graph' (declared line #42) and\n'prepare_commit_graph' (declared line #212). Do these symbols need\nto be extern (in future patches, perhaps)?\n\nThanks!\n\nATB,\nRamsay Jones\n\n builtin/commit-graph.c | 2 +-\n commit-graph.c | 8 ++++----\n 2 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/commit-graph.c b/builtin/commit-graph.c\nindex be1883f1b..efdb003ca 100644\n--- a/builtin/commit-graph.c\n+++ b/builtin/commit-graph.c\n@@ -33,7 +33,7 @@ static struct opts_commit_graph {\n \n static int graph_read(int argc, const char **argv)\n {\n-\tstruct commit_graph *graph = 0;\n+\tstruct commit_graph *graph = NULL;\n \tstruct strbuf full_path = STRBUF_INIT;\n \n \tstatic struct option builtin_commit_graph_read_options[] = {\ndiff --git a/commit-graph.c b/commit-graph.c\nindex fc5ee7e99..c2f443436 100644\n--- a/commit-graph.c\n+++ b/commit-graph.c\n@@ -45,7 +45,7 @@ char *get_graph_latest_filename(const char *obj_dir)\n {\n \tstruct strbuf fname = STRBUF_INIT;\n \tstrbuf_addf(&fname, \"%s/info/graph-latest\", obj_dir);\n-\treturn strbuf_detach(&fname, 0);\n+\treturn strbuf_detach(&fname, NULL);\n }\n \n char *get_graph_latest_contents(const char *obj_dir)\n@@ -60,7 +60,7 @@ char *get_graph_latest_contents(const char *obj_dir)\n \tFREE_AND_NULL(fname);\n \n \tif (!f)\n-\t\treturn 0;\n+\t\treturn NULL;\n \n \twhile (!feof(f)) {\n \t\tif (fgets(buf, sizeof(buf), f))\n@@ -95,10 +95,10 @@ struct commit_graph *load_commit_graph_one(const char *graph_file)\n \tunsigned char graph_version, hash_version;\n \n \tif (fd < 0)\n-\t\treturn 0;\n+\t\treturn NULL;\n \tif (fstat(fd, &st)) {\n \t\tclose(fd);\n-\t\treturn 0;\n+\t\treturn NULL;\n \t}\n \tgraph_size = xsize_t(st.st_size);\n \n-- \n2.16.0\n"},{"id":"340158","messageId":"93d2329a-1963-dca8-2f9e-ba225ead9d0b@web.de","threadId":"47920","inReplyTo":"e0bc5fe0-3b32-bebf-11cd-e335a8cf4e1c@ramsayjones.plus.com","subject":"Re: [PATCH] commit-graph: fix some \"plain integer as NULL pointer\" warnings","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2018-02-24T05:42:58Z","receivedAt":"2018-02-24T05:43:19Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Am 24.02.2018 um 03:24 schrieb Ramsay Jones:\n> diff --git a/commit-graph.c b/commit-graph.c\n> index fc5ee7e99..c2f443436 100644\n> --- a/commit-graph.c\n> +++ b/commit-graph.c\n> @@ -45,7 +45,7 @@ char *get_graph_latest_filename(const char *obj_dir)\n> {\n> \tstruct strbuf fname = STRBUF_INIT;\n> \tstrbuf_addf(&fname, \"%s/info/graph-latest\", obj_dir);\n> -\treturn strbuf_detach(&fname, 0);\n> +\treturn strbuf_detach(&fname, NULL);\n> }\n\nYou could also replace that function body with:\n\n\treturn xstrfmt(\"%s/info/graph-latest\", obj_dir);\n\nRené\n"},{"id":"340303","messageId":"968481f1-dbda-502b-0c6f-41b0232fe870@gmail.com","threadId":"47920","inReplyTo":"93d2329a-1963-dca8-2f9e-ba225ead9d0b@web.de","subject":"Re: [PATCH] commit-graph: fix some \"plain integer as NULL pointer\" warnings","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2018-02-26T14:31:35Z","receivedAt":"2018-02-26T14:31:45Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 2/24/2018 12:42 AM, René Scharfe wrote:\n> Am 24.02.2018 um 03:24 schrieb Ramsay Jones:\n>> diff --git a/commit-graph.c b/commit-graph.c\n>> index fc5ee7e99..c2f443436 100644\n>> --- a/commit-graph.c\n>> +++ b/commit-graph.c\n>> @@ -45,7 +45,7 @@ char *get_graph_latest_filename(const char *obj_dir)\n>> {\n>> \tstruct strbuf fname = STRBUF_INIT;\n>> \tstrbuf_addf(&fname, \"%s/info/graph-latest\", obj_dir);\n>> -\treturn strbuf_detach(&fname, 0);\n>> +\treturn strbuf_detach(&fname, NULL);\n>> }\n> You could also replace that function body with:\n>\n> \treturn xstrfmt(\"%s/info/graph-latest\", obj_dir);\n>\n> René\n\nThanks for the feedback! I will apply these locally as I am re-rolling \ntoday.\n\n-Stolee\n"}]}