Applied patch #1214251 from Thorsten Kukuk for some compiler warnings.

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

diff --git a/cracklib/ChangeLog b/cracklib/ChangeLog
index 1336b83e5a32252cdc9634aef27dc7b502233d1a..3e62727b6ae478206da078914a7dc8aa19a715ba 100644 (file)
--- a/cracklib/ChangeLog
+++ b/cracklib/ChangeLog
@@ -1,3 +1,6 @@
+2005-06-03:
+    * Applied patch #1214251 from Thorsten Kukuk for some compiler warnings.
+
 2005-02-14:
     * Integrated the redhat/fedora patch for broken 64bit dictionaries
 

diff --git a/cracklib/lib/packlib.c b/cracklib/lib/packlib.c
index 139789ef6a43b601d8d9504e511f845f408eedf2..ae7d8f36f9d4bad57cd56342960809f535ee12c0 100644 (file)
--- a/cracklib/lib/packlib.c
+++ b/cracklib/lib/packlib.c
@@ -61,14 +61,12 @@ PWOpen(prefix, mode)
     char *prefix;
     char *mode;
 {
-    uint32_t i;
     int use64 = 0;
     static PWDICT pdesc;
     static PWDICT64 pdesc64;
     char iname[STRINGSIZE];
     char dname[STRINGSIZE];
     char wname[STRINGSIZE];
-    char buffer[STRINGSIZE];
     FILE *dfp;
     FILE *ifp;
     FILE *wfp;
@@ -99,7 +97,7 @@ PWOpen(prefix, mode)
        return ((PWDICT *) 0);
     }
 
-    if (pdesc.wfp = fopen(wname, mode))
+    if ((pdesc.wfp = fopen(wname, mode)))
     {
        pdesc.flags |= PFOR_USEHWMS;
     }
@@ -406,7 +404,7 @@ GetPW(pwp, number)
 
     bptr = buffer;
 
-    for (ostr = data[0]; *(ostr++) = *(bptr++); /* nothing */ );
+    for (ostr = data[0]; (*(ostr++) = *(bptr++)); /* nothing */ );
 
     ostr = data[0];
 
@@ -416,7 +414,7 @@ GetPW(pwp, number)
        strcpy(nstr, ostr);
 
        ostr = nstr + *(bptr++);
-       while (*(ostr++) = *(bptr++));
+       while ((*(ostr++) = *(bptr++)));
 
        ostr = nstr;
     }

diff --git a/cracklib/util/check.c b/cracklib/util/check.c
index 9945dcc68c316c7b7d9de63b2d681ba5499c7dea..1df4f375ecfc32b89cd56586db387b88c8aba6da 100644 (file)
--- a/cracklib/util/check.c
+++ b/cracklib/util/check.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <limits.h>
+#include <string.h>
 
 #define IN_CRACKLIB
 #include "config.h"

diff --git a/cracklib/util/packer.c b/cracklib/util/packer.c
index 0d3cdd867f8c29af8d72c48765d64024bb165b61..850492f27e74abc5b51dc4e0bfcfa041ae94564e 100644 (file)
--- a/cracklib/util/packer.c
+++ b/cracklib/util/packer.c
@@ -7,6 +7,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #define IN_CRACKLIB
 #include "config.h"
@@ -58,13 +59,13 @@ main(argc, argv)
 
        if (!buffer[0])
        {
-           fprintf(stderr, "skipping line: %lu\n", readed);
+           fprintf(stderr, "skipping line: %u\n", readed);
            continue;
        }
 
        if (PutPW(pwp, buffer))
        {
-           fprintf(stderr, "error: PutPW '%s' line %luy\n", buffer, readed);
+           fprintf(stderr, "error: PutPW '%s' line %uy\n", buffer, readed);
        }
 
        wrote++;
@@ -72,7 +73,7 @@ main(argc, argv)
 
     PWClose(pwp);
 
-    printf("%lu %lu\n", readed, wrote);
+    printf("%u %u\n", readed, wrote);
 
     return (0);
 }

diff --git a/cracklib/util/teststr.c b/cracklib/util/teststr.c
index 7915275c2771ebda28fc5b0b17ad366ad1f8578b..f67e769d10ce2743cbecfcb112d10a9e9010c032 100644 (file)
--- a/cracklib/util/teststr.c
+++ b/cracklib/util/teststr.c
@@ -14,7 +14,6 @@
 int
 main ()
 {
-    uint32_t i;
     PWDICT *pwp;
     char buffer[STRINGSIZE];
 
@@ -32,7 +31,7 @@ main ()
 
        Chop(buffer);
        i = FindPW(pwp, buffer);
-       printf ("%s: %lu%s\n", buffer, i, (i==PW_WORDS(pwp) ? " **** NOT FOUND ****" : ""));
+       printf ("%s: %u%s\n", buffer, i, (i==PW_WORDS(pwp) ? " **** NOT FOUND ****" : ""));
     }
 
     return (0);

diff --git a/cracklib/util/unpacker.c b/cracklib/util/unpacker.c
index e7dfe8f0ba75bfeaba81c5102e73a78ffd6c1ab7..b7069f488d226b0abee89b85755bf9e544d74569 100644 (file)
--- a/cracklib/util/unpacker.c
+++ b/cracklib/util/unpacker.c
@@ -20,7 +20,6 @@ main(argc, argv)
 {
     uint32_t i;
     PWDICT *pwp;
-    char buffer[STRINGSIZE];
 
     if (argc <= 1)
     {