use NULL in all places

we already use this in many places, and if your system does not support it, maybe it is time to upgrade

git-svn-id: file:///tmp/cracklib-svn/trunk@217 4175fe1e-86d5-4fdc-8e6a-506fab9d8533

diff --git a/cracklib/lib/fascist.c b/cracklib/lib/fascist.c
index a142abc20cc5ee279b447e668a1dfcc1a852fda9..2d53a9a7af8229ecbded6a9cdb46182ca2ca9cc6 100644 (file)
--- a/cracklib/lib/fascist.c
+++ b/cracklib/lib/fascist.c
@@ -43,7 +43,7 @@ static char *r_destructors[] = {
     ":",                        /* noop - must do this to test raw word. */
 
 #ifdef DEBUG2
-    (char *) 0,
+    NULL,
 #endif
 
     "[",                        /* trimming leading/trailing junk */
@@ -412,14 +412,14 @@ static char *r_destructors[] = {
     "/4s4h",
 
     /* done */
-    (char *) 0
+    NULL
 };
 
 static char *r_constructors[] = {
     ":",
 
 #ifdef DEBUG2
-    (char *) 0,
+    NULL,
 #endif
 
     "r",
@@ -428,7 +428,7 @@ static char *r_constructors[] = {
     "dr",
     "fr",
     "rf",
-    (char *) 0
+    NULL
 };
 
 int
@@ -525,7 +525,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
     wc = 0;
     ptr = gbuffer;
     gwords = 0;
-    uwords[0] = (char *)0;
+    uwords[0] = NULL;
 
     while (*ptr)
     {
@@ -544,11 +544,11 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
 
        if (wc == STRINGSIZE)
        {
-           uwords[--wc] = (char *) 0;  /* to hell with it */
+           uwords[--wc] = NULL;  /* to hell with it */
            break;
        } else
        {
-           uwords[wc] = (char *) 0;
+           uwords[wc] = NULL;
        }
 
        while (*ptr && !ISSKIP(*ptr))
@@ -619,7 +619,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
        }
     }
 
-    return ((char *) 0);
+    return NULL;
 }
 
 char *
@@ -821,7 +821,7 @@ FascistLookUser(PWDICT *pwp, char *instring,
        }
     }
 
-    return ((char *) 0);
+    return NULL;
 }
 
 char *

diff --git a/cracklib/lib/packlib.c b/cracklib/lib/packlib.c
index 8f32d14b3119712b68b4b56d0acb007dc93afa7f..f12d3a13572a151a770a9ea7299928f552bd26a3 100644 (file)
--- a/cracklib/lib/packlib.c
+++ b/cracklib/lib/packlib.c
@@ -324,7 +324,7 @@ PWClose(pwp)
     if (pwp->flags & PFOR_WRITE)
     {
        pwp->flags |= PFOR_FLUSH;
-       PutPW(pwp, (char *) 0); /* flush last index if necess */
+       PutPW(pwp, NULL);       /* flush last index if necess */
 
        if (fseek(pwp->ifp, 0L, 0))
        {
@@ -465,26 +465,26 @@ GetPW(pwp, number)
        if (fseek(pwp->ifp, sizeof(struct pi_header64) + (thisblock * sizeof(uint64_t)), 0))
        {
            perror("(index fseek failed)");
-           return ((char *) 0);
+           return NULL;
        }
 
        if (!fread((char *) &datum64, sizeof(datum64), 1, pwp->ifp))
        {
            perror("(index fread failed)");
-           return ((char *) 0);
+           return NULL;
        }
        datum = datum64;
     } else {
        if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0))
        {
            perror("(index fseek failed)");
-           return ((char *) 0);
+           return NULL;
        }
 
        if (!fread((char *) &datum, sizeof(datum), 1, pwp->ifp))
        {
            perror("(index fread failed)");
-           return ((char *) 0);
+           return NULL;
        }
     }
 
@@ -504,7 +504,7 @@ GetPW(pwp, number)
     if (r)
     {
        perror("(data fseek failed)");
-       return ((char *) 0);
+       return NULL;
     }
        r = 0;
 
@@ -525,7 +525,7 @@ GetPW(pwp, number)
     if (!r)
     {
        perror("(data fread failed)");
-       return ((char *) 0);
+       return NULL;
     }
 
     prevblock = thisblock;

diff --git a/cracklib/lib/rules.c b/cracklib/lib/rules.c
index 7091464cc383df57eb9d8345e6df67cffe90680a..d193cc04b266edb9f445cdbe4159370281a0e5ee 100644 (file)
--- a/cracklib/lib/rules.c
+++ b/cracklib/lib/rules.c
@@ -368,7 +368,7 @@ PolyStrchr(string, class)
        }
        string++;
     }
-    return ((char *) 0);
+    return NULL;
 }
 
 char *
@@ -471,18 +471,18 @@ Mangle(input, control)            /* returns a pointer to a controlled Mangle */
            if (!ptr[1])
            {
                Debug(1, "Mangle: '>' missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                limit = Char2Int(*(++ptr));
                if (limit < 0)
                {
                    Debug(1, "Mangle: '>' weird argument in '%s'\n", control);
-                   return ((char *) 0);
+                   return NULL;
                }
                if ( (int) strlen(area) <= limit)
                {
-                   return ((char *) 0);
+                   return NULL;
                }
            }
            break;
@@ -490,18 +490,18 @@ Mangle(input, control)            /* returns a pointer to a controlled Mangle */
            if (!ptr[1])
            {
                Debug(1, "Mangle: '<' missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                limit = Char2Int(*(++ptr));
                if (limit < 0)
                {
                    Debug(1, "Mangle: '<' weird argument in '%s'\n", control);
-                   return ((char *) 0);
+                   return NULL;
                }
                if ( (int) strlen(area) >= limit)
                {
-                   return ((char *) 0);
+                   return NULL;
                }
            }
            break;
@@ -509,7 +509,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1])
            {
                Debug(1, "Mangle: prepend missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                area2[0] = *(++ptr);
@@ -521,7 +521,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1])
            {
                Debug(1, "Mangle: append missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                register char *string;
@@ -535,7 +535,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || !ptr[2])
            {
                Debug(1, "Mangle: extract missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                register int i;
@@ -546,7 +546,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
                if (start < 0 || length < 0)
                {
                    Debug(1, "Mangle: extract: weird argument in '%s'\n", control);
-                   return ((char *) 0);
+                   return NULL;
                }
                strcpy(area2, area);
                for (i = 0; length-- && area2[start + i]; i++)
@@ -561,7 +561,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || !ptr[2])
            {
                Debug(1, "Mangle: overstrike missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                register int i;
@@ -570,7 +570,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
                {
                    Debug(1, "Mangle: overstrike weird argument in '%s'\n",
                          control);
-                   return ((char *) 0);
+                   return NULL;
                } else
                {
                    ++ptr;
@@ -585,7 +585,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || !ptr[2])
            {
                Debug(1, "Mangle: insert missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                register int i;
@@ -596,7 +596,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
                {
                    Debug(1, "Mangle: insert weird argument in '%s'\n",
                          control);
-                   return ((char *) 0);
+                   return NULL;
                }
                p1 = area;
                p2 = area2;
@@ -616,7 +616,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
            {
                Debug(1, "Mangle: delete missing arguments in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else if (ptr[1] != RULE_CLASS)
            {
                strcpy(area, Purge(area, *(++ptr)));
@@ -630,7 +630,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || !ptr[2] || (ptr[1] == RULE_CLASS && !ptr[3]))
            {
                Debug(1, "Mangle: subst missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else if (ptr[1] != RULE_CLASS)
            {
                strcpy(area, Substitute(area, ptr[1], ptr[2]));
@@ -645,18 +645,18 @@ Mangle(input, control)            /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
            {
                Debug(1, "Mangle: '/' missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else if (ptr[1] != RULE_CLASS)
            {
                if (!strchr(area, *(++ptr)))
                {
-                   return ((char *) 0);
+                   return NULL;
                }
            } else
            {
                if (!PolyStrchr(area, ptr[2]))
                {
-                   return ((char *) 0);
+                   return NULL;
                }
                ptr += 2;
            }
@@ -665,18 +665,18 @@ Mangle(input, control)            /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
            {
                Debug(1, "Mangle: '!' missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else if (ptr[1] != RULE_CLASS)
            {
                if (strchr(area, *(++ptr)))
                {
-                   return ((char *) 0);
+                   return NULL;
                }
            } else
            {
                if (PolyStrchr(area, ptr[2]))
                {
-                   return ((char *) 0);
+                   return NULL;
                }
                ptr += 2;
            }
@@ -694,28 +694,28 @@ Mangle(input, control)            /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || !ptr[2] || (ptr[2] == RULE_CLASS && !ptr[3]))
            {
                Debug(1, "Mangle: '=' missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                register int i;
                if ((i = Char2Int(ptr[1])) < 0)
                {
                    Debug(1, "Mangle: '=' weird argument in '%s'\n", control);
-                   return ((char *) 0);
+                   return NULL;
                }
                if (ptr[2] != RULE_CLASS)
                {
                    ptr += 2;
                    if (area[i] != *ptr)
                    {
-                       return ((char *) 0);
+                       return NULL;
                    }
                } else
                {
                    ptr += 3;
                    if (!MatchClass(*ptr, area[i]))
                    {
-                       return ((char *) 0);
+                       return NULL;
                    }
                }
            }
@@ -746,7 +746,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
            {
                Debug(1, "Mangle: '(' missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                if (ptr[1] != RULE_CLASS)
@@ -754,14 +754,14 @@ Mangle(input, control)            /* returns a pointer to a controlled Mangle */
                    ptr++;
                    if (area[0] != *ptr)
                    {
-                       return ((char *) 0);
+                       return NULL;
                    }
                } else
                {
                    ptr += 2;
                    if (!MatchClass(*ptr, area[0]))
                    {
-                       return ((char *) 0);
+                       return NULL;
                    }
                }
            }
@@ -769,7 +769,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
            if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
            {
                Debug(1, "Mangle: ')' missing argument in '%s'\n", control);
-               return ((char *) 0);
+               return NULL;
            } else
            {
                register int i;
@@ -781,7 +781,7 @@ Mangle(input, control)              /* returns a pointer to a controlled Mangle */
                    i--;
                } else
                {
-                   return ((char *) 0);
+                   return NULL;
                }
 
                if (ptr[1] != RULE_CLASS)
@@ -789,27 +789,27 @@ Mangle(input, control)            /* returns a pointer to a controlled Mangle */
                    ptr++;
                    if (area[i] != *ptr)
                    {
-                       return ((char *) 0);
+                       return NULL;
                    }
                } else
                {
                    ptr += 2;
                    if (!MatchClass(*ptr, area[i]))
                    {
-                       return ((char *) 0);
+                       return NULL;
                    }
                }
            }
 
        default:
            Debug(1, "Mangle: unknown command %c in %s\n", *ptr, control);
-           return ((char *) 0);
+           return NULL;
            break;
        }
     }
     if (!area[0])              /* have we deweted de poor widdle fing away? */
     {
-       return ((char *) 0);
+       return NULL;
     }
     return (area);
 }