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>

5 files changed, 9 insertions, 9 deletions

diff --git a/string/argz-delete.c b/string/argz-delete.c
index e513e46d58..879daa9821 100644
--- a/string/argz-delete.c
+++ b/string/argz-delete.c
@@ -33,7 +33,7 @@ argz_delete (char **argz, size_t *argz_len, char *entry)
       if (*argz_len == 0)
 	{
 	  free (*argz);
-	  *argz = 0;
+	  *argz = NULL;
 	}
     }
 }
diff --git a/string/argz-extract.c b/string/argz-extract.c
index e685da5795..fd0003965d 100644
--- a/string/argz-extract.c
+++ b/string/argz-extract.c
@@ -30,6 +30,6 @@ __argz_extract (const char *argz, size_t len, char **argv)
       argz += part_len + 1;
       len -= part_len + 1;
     }
-  *argv = 0;
+  *argv = NULL;
 }
 weak_alias (__argz_extract, argz_extract)
diff --git a/string/argz-replace.c b/string/argz-replace.c
index fdd9a8e1c9..d2add630ff 100644
--- a/string/argz-replace.c
+++ b/string/argz-replace.c
@@ -38,7 +38,7 @@ str_append (char **to, size_t *to_len, const char *buf, const size_t buf_len)
   else
     {
       free (*to);
-      *to = 0;
+      *to = NULL;
     }
 }
 
@@ -53,10 +53,10 @@ __argz_replace (char **argz, size_t *argz_len, const char *str, const char *with
 
   if (str && *str)
     {
-      char *arg = 0;
+      char *arg = NULL;
       char *src = *argz;
       size_t src_len = *argz_len;
-      char *dst = 0;
+      char *dst = NULL;
       size_t dst_len = 0;
       int delayed_copy = 1;	/* True while we've avoided copying anything.  */
       size_t str_len = strlen (str), with_len = strlen (with);
@@ -84,7 +84,7 @@ __argz_replace (char **argz, size_t *argz_len, const char *str, const char *with
 		      else
 			{
 			  str_append (&to, &to_len, from, strlen (from));
-			  from = 0;
+			  from = NULL;
 			}
 		    }
 		}
diff --git a/string/argz.h b/string/argz.h
index 49e85a09ec..b2dd994132 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -141,7 +141,7 @@ __NTH (__argz_next (const char *__argz, size_t __argz_len,
       return __entry >= __argz + __argz_len ? (char *) NULL : (char *) __entry;
     }
   else
-    return __argz_len > 0 ? (char *) __argz : 0;
+    return __argz_len > 0 ? (char *) __argz : NULL;
 }
 __extern_inline char *
 __NTH (argz_next (const char *__argz, size_t __argz_len,
diff --git a/string/envz.c b/string/envz.c
index cb02b4b338..4f53dcb2e7 100644
--- a/string/envz.c
+++ b/string/envz.c
@@ -50,7 +50,7 @@ envz_entry (const char *envz, size_t envz_len, const char *name)
 	envz++, envz_len--;	/* skip '\0' */
     }
 
-  return 0;
+  return NULL;
 }
 libc_hidden_def (envz_entry)
 
@@ -67,7 +67,7 @@ envz_get (const char *envz, size_t envz_len, const char *name)
       if (*entry)
 	entry++;
       else
-	entry = 0;		/* A null entry.  */
+	entry = NULL;		/* A null entry.  */
     }
   return entry;
 }