Silence most -Wzero-as-null-pointer-constant diagnostics

Replace 0 by NULL and {0} by {}.

Omit a few cases that aren't so trivial to fix.

Link: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117059>
Link: <https://software.codidact.com/posts/292718/292759#answer-292759>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

4 files changed, 12 insertions, 12 deletions

diff --git a/resolv/base64.c b/resolv/base64.c
index 6237257..1146323 100644
--- a/resolv/base64.c
+++ b/resolv/base64.c
@@ -205,7 +205,7 @@ b64_pton (char const *src, u_char *target, size_t targsize)
 			break;
 
 		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
+		if (pos == NULL) 		/* A non-base64 character. */
 			return (-1);
 
 		switch (state) {
diff --git a/resolv/compat-gethnamaddr.c b/resolv/compat-gethnamaddr.c
index 1c630fc..eec68d0 100644
--- a/resolv/compat-gethnamaddr.c
+++ b/resolv/compat-gethnamaddr.c
@@ -804,7 +804,7 @@ _gethtbyname2 (const char *name, int af)
 			continue;
 		if (strcasecmp(p->h_name, name) == 0)
 			break;
-		for (cp = p->h_aliases; *cp != 0; cp++)
+		for (cp = p->h_aliases; *cp != NULL; cp++)
 			if (strcasecmp(*cp, name) == 0)
 				goto found;
 	}
diff --git a/resolv/res_debug.c b/resolv/res_debug.c
index 1b1f523..73af0c7 100644
--- a/resolv/res_debug.c
+++ b/resolv/res_debug.c
@@ -503,7 +503,7 @@ const struct res_sym __p_rcode_syms[] attribute_hidden = {
 
 int
 sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for ((void)NULL; syms->name != 0; syms++) {
+	for ((void)NULL; syms->name != NULL; syms++) {
 		if (strcasecmp (name, syms->name) == 0) {
 			if (success)
 				*success = 1;
@@ -519,7 +519,7 @@ const char *
 sym_ntos(const struct res_sym *syms, int number, int *success) {
 	static char unname[20];
 
-	for ((void)NULL; syms->name != 0; syms++) {
+	for ((void)NULL; syms->name != NULL; syms++) {
 		if (number == syms->number) {
 			if (success)
 				*success = 1;
@@ -538,7 +538,7 @@ const char *
 sym_ntop(const struct res_sym *syms, int number, int *success) {
 	static char unname[20];
 
-	for ((void)NULL; syms->name != 0; syms++) {
+	for ((void)NULL; syms->name != NULL; syms++) {
 		if (number == syms->number) {
 			if (success)
 				*success = 1;
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index e115894..1737bce 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -118,12 +118,12 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args)
 	  if (__asprintf (&buf, _("\
 %s: line %d: cannot specify more than %d trim domains"),
 			  fname, line_num, TRIMDOMAINS_MAX) < 0)
-	    return 0;
+	    return NULL;
 
 	  __fxprintf (NULL, "%s", buf);
 
 	  free (buf);
-	  return 0;
+	  return NULL;
 	}
       _res_hconf.trimdomain[_res_hconf.num_trimdomains++] =
 	__strndup (start, len);
@@ -139,12 +139,12 @@ arg_trimdomain_list (const char *fname, int line_num, const char *args)
 	      if (__asprintf (&buf, _("\
 %s: line %d: list delimiter not followed by domain"),
 			      fname, line_num) < 0)
-		return 0;
+		return NULL;
 
 	      __fxprintf (NULL, "%s", buf);
 
 	      free (buf);
-	      return 0;
+	      return NULL;
 	    }
 	default:
 	  break;
@@ -175,12 +175,12 @@ arg_bool (const char *fname, int line_num, const char *args, unsigned flag)
       if (__asprintf (&buf,
 		      _("%s: line %d: expected `on' or `off', found `%s'\n"),
 		      fname, line_num, args) < 0)
-	return 0;
+	return NULL;
 
       __fxprintf (NULL, "%s", buf);
 
       free (buf);
-      return 0;
+      return NULL;
     }
   return args;
 }
@@ -190,7 +190,7 @@ static void
 parse_line (const char *fname, int line_num, const char *str)
 {
   const char *start;
-  const struct cmd *c = 0;
+  const struct cmd *c = NULL;
   size_t len;
   size_t i;