Skip to contentSkip to conversation

commit-graph: fix some "plain integer as NULL pointer" warnings

PATCH In review Ramsay Jones 3 participants 3 messages Feb 24, 2018 – Feb 26, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 commit-graph: fix some "plain integer as NULL pointer" warnings

---

Hi Derrick,

If you need to re-roll your 'ds/commit-graph' branch, could you please squash this into the relevant patches (corresponding to commits 0fd2d95ee6 ["commit-graph: implement --set-latest"], a33b9b79ff ["commit-graph: implement --delete-expired"] and finally commit b534f9e961 ["commit-graph: implement git commit-graph read"]).

Also, I note that two symbols are only used in commit-graph.c but are declared extern. Namely 'commit_graph' (declared line #42) and 'prepare_commit_graph' (declared line #212). Do these symbols need to be extern (in future patches, perhaps)?

Thanks!

ATB,
Ramsay Jones

 builtin/commit-graph.c | 2 +-
 commit-graph.c         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
builtin/commit-graph.c +1 -1
index be1883f1b..efdb003ca 100644
@@ -33,7 +33,7 @@ static struct opts_commit_graph {
 
 static int graph_read(int argc, const char **argv)
 {
-	struct commit_graph *graph = 0;
+	struct commit_graph *graph = NULL;
 	struct strbuf full_path = STRBUF_INIT;
 
 	static struct option builtin_commit_graph_read_options[] = {
commit-graph.c +4 -4
index fc5ee7e99..c2f443436 100644
@@ -45,7 +45,7 @@ char *get_graph_latest_filename(const char *obj_dir)
 {
 	struct strbuf fname = STRBUF_INIT;
 	strbuf_addf(&fname, "%s/info/graph-latest", obj_dir);
-	return strbuf_detach(&fname, 0);
+	return strbuf_detach(&fname, NULL);
 }
 
 char *get_graph_latest_contents(const char *obj_dir)
@@ -60,7 +60,7 @@ char *get_graph_latest_contents(const char *obj_dir)
 	FREE_AND_NULL(fname);
 
 	if (!f)
-		return 0;
+		return NULL;
 
 	while (!feof(f)) {
 		if (fgets(buf, sizeof(buf), f))
@@ -95,10 +95,10 @@ struct commit_graph *load_commit_graph_one(const char *graph_file)
 	unsigned char graph_version, hash_version;
 
 	if (fd < 0)
-		return 0;
+		return NULL;
 	if (fstat(fd, &st)) {
 		close(fd);
-		return 0;
+		return NULL;
 	}
 	graph_size = xsize_t(st.st_size);
 
Signature · 1 line
2.16.0
#1 lore raw

Am 24.02.2018 um 03:24 schrieb Ramsay Jones:

commit-graph.c char *get_graph_latest_filename(const char *obj_dir) · line 49

Quoted 11 lines
commit-graph.c +1 -1
index fc5ee7e99..c2f443436 100644
@@ -45,7 +45,7 @@ char *get_graph_latest_filename(const char *obj_dir)
  {
  	struct strbuf fname = STRBUF_INIT;
  	strbuf_addf(&fname, "%s/info/graph-latest", obj_dir);
-	return strbuf_detach(&fname, 0);
+	return strbuf_detach(&fname, NULL);
  }

You could also replace that function body with:

	return xstrfmt("%s/info/graph-latest", obj_dir);

René

#2 lore raw
Quoted 14 lines · René Scharfe

Am 24.02.2018 um 03:24 schrieb Ramsay Jones:

commit-graph.c char *get_graph_latest_filename(const char *obj_dir) · line 49

Quoted 11 lines
commit-graph.c +1 -1
index fc5ee7e99..c2f443436 100644
@@ -45,7 +45,7 @@ char *get_graph_latest_filename(const char *obj_dir)
   {
   	struct strbuf fname = STRBUF_INIT;
   	strbuf_addf(&fname, "%s/info/graph-latest", obj_dir);
-	return strbuf_detach(&fname, 0);
+	return strbuf_detach(&fname, NULL);
   }

You could also replace that function body with:

Quoted 3 lines
	return xstrfmt("%s/info/graph-latest", obj_dir);

René

Thanks for the feedback! I will apply these locally as I am re-rolling today.

-Stolee