Fix comparisons of pointers with zero to compare with NULL instead.

tglsfdc · tglsfdc · commit bfd3f37be309 · 2010-10-29T15:51:52.000-04:00
Per C standard, these are semantically the same thing; but saying NULL
when you mean NULL is good for readability.

Marti Raudsepp, per results of INRIA's Coccinelle.
diff --git a/src/backend/regex/regc_lex.c b/src/backend/regex/regc_lex.c
@@ -846,7 +846,7 @@ lexescape(struct vars * v)
 			if (ISERR())
 				FAILW(REG_EESCAPE);
 			/* ugly heuristic (first test is "exactly 1 digit?") */
-			if (v->now - save == 0 || ((int) c > 0 && (int) c <= v->nsubexp))
+			if (v->now == save || ((int) c > 0 && (int) c <= v->nsubexp))
 			{
 				NOTE(REG_UBACKREF);
 				RETV(BACKREF, (chr) c);
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
@@ -395,7 +395,7 @@ getWeights(ArrayType *win)
 	int			i;
 	float4	   *arrdata;
 
-	if (win == 0)
+	if (win == NULL)
 		return weights;
 
 	if (ARR_NDIM(win) != 1)
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
@@ -616,7 +616,7 @@ find_in_dynamic_libpath(const char *basename)
 					(errcode(ERRCODE_INVALID_NAME),
 					 errmsg("zero-length component in parameter \"dynamic_library_path\"")));
 
-		if (piece == 0)
+		if (piece == NULL)
 			len = strlen(p);
 		else
 			len = piece - p;
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -576,7 +576,7 @@ tarWrite(const void *buf, size_t len, TAR_MEMBER *th)
 {
 	size_t		res;
 
-	if (th->zFH != 0)
+	if (th->zFH != NULL)
 		res = GZWRITE((void *) buf, 1, len, th->zFH);
 	else
 		res = fwrite(buf, 1, len, th->nFH);
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
@@ -246,7 +246,7 @@ pgsymlink(const char *oldpath, const char *newpath)
 	else
 		strcpy(nativeTarget, oldpath);
 
-	while ((p = strchr(p, '/')) != 0)
+	while ((p = strchr(p, '/')) != NULL)
 		*p++ = '\\';
 
 	len = strlen(nativeTarget) * sizeof(WCHAR);
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
@@ -810,7 +810,7 @@ associate(void)
 			 * Note, though, that if there's no rule, a '%s' in the format is
 			 * a bad thing.
 			 */
-			if (strchr(zp->z_format, '%') != 0)
+			if (strchr(zp->z_format, '%') != NULL)
 				error(_("%s in ruleless zone"));
 		}
 	}
@@ -1111,9 +1111,9 @@ inzsub(char **fields, int nfields, int iscont)
 	z.z_filename = filename;
 	z.z_linenum = linenum;
 	z.z_gmtoff = gethms(fields[i_gmtoff], _("invalid UTC offset"), TRUE);
-	if ((cp = strchr(fields[i_format], '%')) != 0)
+	if ((cp = strchr(fields[i_format], '%')) != NULL)
 	{
-		if (*++cp != 's' || strchr(cp, '%') != 0)
+		if (*++cp != 's' || strchr(cp, '%') != NULL)
 		{
 			error(_("invalid abbreviation format"));
 			return FALSE;
@@ -1438,9 +1438,9 @@ rulesub(struct rule * rp, const char *loyearp, const char *hiyearp,
 	}
 	else
 	{
-		if ((ep = strchr(dp, '<')) != 0)
+		if ((ep = strchr(dp, '<')) != NULL)
 			rp->r_dycode = DC_DOWLEQ;
-		else if ((ep = strchr(dp, '>')) != 0)
+		else if ((ep = strchr(dp, '>')) != NULL)
 			rp->r_dycode = DC_DOWGEQ;
 		else
 		{
@@ -2826,7 +2826,7 @@ mkdirs(char *argname)
 	if (argname == NULL || *argname == '\0')
 		return 0;
 	cp = name = ecpyalloc(argname);
-	while ((cp = strchr(cp + 1, '/')) != 0)
+	while ((cp = strchr(cp + 1, '/')) != NULL)
 	{
 		*cp = '\0';
 #ifdef WIN32

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ lexescape(struct vars * v)`
`846`	`846`	`if (ISERR())`
`847`	`847`	`FAILW(REG_EESCAPE);`
`848`	`848`	`/* ugly heuristic (first test is "exactly 1 digit?") */`
`849`		`- if (v->now - save == 0 \|\| ((int) c > 0 && (int) c <= v->nsubexp))`
	`849`	`+ if (v->now == save \|\| ((int) c > 0 && (int) c <= v->nsubexp))`
`850`	`850`	`{`
`851`	`851`	`NOTE(REG_UBACKREF);`
`852`	`852`	`RETV(BACKREF, (chr) c);`
Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ tarWrite(const void buf, size_t len, TAR_MEMBER th)`
`576`	`576`	`{`
`577`	`577`	`size_t res;`
`578`	`578`
`579`		`- if (th->zFH != 0)`
	`579`	`+ if (th->zFH != NULL)`
`580`	`580`	`res = GZWRITE((void *) buf, 1, len, th->zFH);`
`581`	`581`	`else`
`582`	`582`	`res = fwrite(buf, 1, len, th->nFH);`
Original file line number	Diff line number	Diff line change
`@@ -810,7 +810,7 @@ associate(void)`
`810`	`810`	`* Note, though, that if there's no rule, a '%s' in the format is`
`811`	`811`	`* a bad thing.`
`812`	`812`	`*/`
`813`		`- if (strchr(zp->z_format, '%') != 0)`
	`813`	`+ if (strchr(zp->z_format, '%') != NULL)`
`814`	`814`	`error(_("%s in ruleless zone"));`
`815`	`815`	`}`
`816`	`816`	`}`
`@@ -1111,9 +1111,9 @@ inzsub(char **fields, int nfields, int iscont)`
`1111`	`1111`	`z.z_filename = filename;`
`1112`	`1112`	`z.z_linenum = linenum;`
`1113`	`1113`	`z.z_gmtoff = gethms(fields[i_gmtoff], _("invalid UTC offset"), TRUE);`
`1114`		`- if ((cp = strchr(fields[i_format], '%')) != 0)`
	`1114`	`+ if ((cp = strchr(fields[i_format], '%')) != NULL)`
`1115`	`1115`	`{`
`1116`		`- if (*++cp != 's' \|\| strchr(cp, '%') != 0)`
	`1116`	`+ if (*++cp != 's' \|\| strchr(cp, '%') != NULL)`
`1117`	`1117`	`{`
`1118`	`1118`	`error(_("invalid abbreviation format"));`
`1119`	`1119`	`return FALSE;`
`@@ -1438,9 +1438,9 @@ rulesub(struct rule * rp, const char loyearp, const char hiyearp,`
`1438`	`1438`	`}`
`1439`	`1439`	`else`
`1440`	`1440`	`{`
`1441`		`- if ((ep = strchr(dp, '<')) != 0)`
	`1441`	`+ if ((ep = strchr(dp, '<')) != NULL)`
`1442`	`1442`	`rp->r_dycode = DC_DOWLEQ;`
`1443`		`- else if ((ep = strchr(dp, '>')) != 0)`
	`1443`	`+ else if ((ep = strchr(dp, '>')) != NULL)`
`1444`	`1444`	`rp->r_dycode = DC_DOWGEQ;`
`1445`	`1445`	`else`
`1446`	`1446`	`{`
`@@ -2826,7 +2826,7 @@ mkdirs(char *argname)`
`2826`	`2826`	`if (argname == NULL \|\| *argname == '\0')`
`2827`	`2827`	`return 0;`
`2828`	`2828`	`cp = name = ecpyalloc(argname);`
`2829`		`- while ((cp = strchr(cp + 1, '/')) != 0)`
	`2829`	`+ while ((cp = strchr(cp + 1, '/')) != NULL)`
`2830`	`2830`	`{`
`2831`	`2831`	`*cp = '\0';`
`2832`	`2832`	`#ifdef WIN32`