Some gcc -W cleanup

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 1cebe171d4664e011c806c26b7222c315a28de33..03c514379431b6c601b3a9c757330aa06291eca5 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -33,6 +33,7 @@ static int dodelete LDAP_P((
     LDAP       *ld,
     char       *dn));
 
+int
 main( argc, argv )
     int                argc;
     char       **argv;

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 9e8546248d946d0b41edbaf91b8291ff8372e3ed..074c5259e71ccfbee744ef859847f672ce003b29 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -69,6 +69,7 @@ static int fromfile LDAP_P(( char *path, struct berval *bv ));
 static char *read_one_record LDAP_P(( FILE *fp ));
 
 
+int
 main( int argc, char **argv )
 {
     char               *infile, *rbuf, *start, *p, *q;

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index bbfead056c5934cb2e0433c4a5993cdc577d603a..e8e71473e05006dda41f449843c299a06114218a 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -35,6 +35,7 @@ static int domodrdn LDAP_P((
     char       *rdn,
     int                remove));       /* flag: remove old RDN */
 
+int
 main( argc, argv )
     int                argc;
     char       **argv;

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index cc9d7f156724a9311db25a845d249d149eda5157..d7411e86bb40ca5bea22f616b679e022ed349e2d 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -86,6 +86,7 @@ static char   *sortattr = NULL;
 static int     skipsortattr = 0;
 static int     verbose, not, includeufn, allow_binary, vals2tmp, ldif;
 
+int
 main( argc, argv )
 int    argc;
 char   **argv;

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index 0b49037b71e363eb50c6b8e863ec1c0b1d8e13e6..b7606e3d4fb80c3112dd298eaaab7f563ffb11e1 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -43,7 +43,7 @@ ber_get_tag( BerElement *ber )
        unsigned char   xbyte;
        unsigned long   tag;
        char            *tagp;
-       int             i;
+       unsigned int    i;
 
        if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
                return( LBER_DEFAULT );
@@ -386,8 +386,8 @@ va_dcl
        char            *s, **ss, ***sss;
        struct berval   ***bv, **bvp, *bval;
        int             *i, j;
-       long            *l, rc, tag;
-       unsigned long   len;
+       long            *l;
+       unsigned long   rc, tag, len;
 
 #if defined( HAVE_STDARG_H ) && __STDC__
        va_start( ap, fmt );

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 4f41a8a2cdde75bcec2b45406aab2280e863d059..884c63ebd289e20c0101ba0a1a0fd9e96cdfa3b6 100644 (file)
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -439,7 +439,7 @@ get_tag( Sockbuf *sb )
        unsigned char   xbyte;
        unsigned long   tag;
        char            *tagp;
-       int             i;
+       unsigned int    i;
 
        if ( BerRead( sb, (char *) &xbyte, 1 ) != 1 )
                return( LBER_DEFAULT );

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 04d9f255a7c9a523462acc30154db603cf639a20..c8b0d3e8a03e0e09407fb0d2c735bc684930b43b 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -127,7 +127,7 @@ ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit )
        LDAPMessage     *lm;
        BerElement      ber;
        long            along;
-       int             rc;
+       unsigned long   rc;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_result2error\n", 0, 0, 0 );
 

diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
index 2e48818fb169242fe176be27696bdc46191a1f59..2ac502bd84d33b5cf4930d6c6a833eb92b4e59eb 100644 (file)
--- a/libraries/libldap/options.c
+++ b/libraries/libldap/options.c
@@ -28,7 +28,7 @@ ldap_get_option(
        if(ldp == NULL) {
                ld = &openldap_ld_globals;
        } else {
-               ld = ld;
+               ld = ldp;
        }
 
        switch(option) {
@@ -136,7 +136,7 @@ ldap_set_option(
        if(ldp == NULL) {
                ld = &openldap_ld_globals;
        } else {
-               ld = ld;
+               ld = ldp;
        }
 
        switch(option) {

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 21adc2728794a8ef9851626210a237a764e53cd0..6714209e2b42c6127e360fe57a405989bbc0e26c 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -30,7 +30,7 @@ static int wait4msg LDAP_P(( LDAP *ld, int msgid, int all, struct timeval *timeo
 #ifdef LDAP_REFERRALS
 static int read1msg LDAP_P(( LDAP *ld, int msgid, int all, Sockbuf *sb, LDAPConn *lc,
        LDAPMessage **result ));
-static int build_result_ber LDAP_P(( LDAP *ld, BerElement *ber, LDAPRequest *lr ));
+static unsigned long build_result_ber LDAP_P(( LDAP *ld, BerElement *ber, LDAPRequest *lr ));
 static void merge_error_info LDAP_P(( LDAP *ld, LDAPRequest *parentr, LDAPRequest *lr ));
 #else /* LDAP_REFERRALS */
 static int read1msg LDAP_P(( LDAP *ld, int msgid, int all, Sockbuf *sb,
@@ -512,7 +512,7 @@ lr->lr_res_matched ? lr->lr_res_matched : "" );
 
 
 #ifdef LDAP_REFERRALS
-static int
+static unsigned long
 build_result_ber( LDAP *ld, BerElement *ber, LDAPRequest *lr )
 {
        unsigned long   len;
@@ -523,7 +523,7 @@ build_result_ber( LDAP *ld, BerElement *ber, LDAPRequest *lr )
        if ( ber_printf( ber, "{it{ess}}", lr->lr_msgid,
            (long)lr->lr_res_msgtype, lr->lr_res_errno,
            lr->lr_res_matched ? lr->lr_res_matched : "",
-           lr->lr_res_error ? lr->lr_res_error : "" ) == LBER_ERROR ) {
+           lr->lr_res_error ? lr->lr_res_error : "" ) == -1 ) {
                return( LBER_ERROR );
        }
 

diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index a0137b0605ef55baee56ef7c167379548827831d..7e7eb17447016fce188cb9255a7d4693bc01e69a 100644 (file)
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -30,7 +30,7 @@ struct entrything {
 };
 
 static int     (*et_cmp_fn) LDAP_P(( char *a, char *b ));
-static int     et_cmp LDAP_P(( void *aa, void *bb));
+static int     et_cmp LDAP_P(( const void *aa, const void *bb));
 
 
 int
@@ -44,13 +44,13 @@ ldap_sort_strcasecmp(
 
 static int
 et_cmp(
-       void    *aa,
-       void    *bb
+       const void      *aa,
+       const void      *bb
 )
 {
        int                     i, rc;
-       struct entrything       *a = (struct entrything *)aa;
-       struct entrything       *b = (struct entrything *)bb;
+       const struct entrything *a = (const struct entrything *)aa;
+       const struct entrything *b = (const struct entrything *)bb;
 
        if ( a->et_vals == NULL && b->et_vals == NULL )
                return( 0 );

diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index 4eac35344fc8b94eb27492a1019c2f03a30ec8bc..bd5aaca12424aa2221859988ed3881eba02e77bd 100644 (file)
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -195,7 +195,7 @@ do_entry2text(
            sprintf( buf + strlen( buf ),
                    "%s\">Move Up To <EM>%s</EM></A>%s<BR>",
                    ( vals[ 1 ] == NULL ) ? "??one" : "",
-                   ( untagged != NULL ) ? untagged + 1 : vals[ 1 ], eol, eol );
+                   ( untagged != NULL ) ? untagged + 1 : vals[ 1 ], eol );
            (*writeproc)( writeparm, buf, strlen( buf ));
 
            /*

diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index df3bb6d57c3b5d46283bb9e527f8399b97de8f67..23e6f842f9e55eba8e2b38c2237011f4a60c22eb 100644 (file)
--- a/libraries/libldbm/ldbm.c
+++ b/libraries/libldbm/ldbm.c
@@ -414,7 +414,8 @@ ldbm_datum_dup( LDBM ldbm, Datum data )
                return( dup );
        }
        dup.dsize = data.dsize;
-       if ( dup.dptr = (char *) malloc( data.dsize ) )
+       dup.dptr = (char *) malloc( data.dsize );
+       if ( dup.dptr )
                memcpy( dup.dptr, data.dptr, data.dsize );
 
        return( dup );

diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index ba72e01532b5306c42503e2ba7317d31c546fbbb..2761ec5e0b2b2c9d3d89b70184ef55d85766eed0 100644 (file)
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -187,7 +187,7 @@ str_getline( char **next )
                        *(*next)++ = '\0';
                        break;
                }
-               *(*next)++;
+               (*next)++;
        }
 
        return( l );
@@ -215,7 +215,7 @@ put_type_and_value( char **out, char *t, char *val, int vlen )
        b64 = 0;
 
        stop = (unsigned char *) (val + vlen);
-       if ( isascii( val[0] ) && isspace( val[0] ) || val[0] == ':' ) {
+       if ( isascii( val[0] ) && (isspace( val[0] ) || val[0] == ':') ) {
                b64 = 1;
        } else {
                for ( byte = (unsigned char *) val; byte < stop;

diff --git a/libraries/liblutil/base64.c b/libraries/liblutil/base64.c
index 6f4b88fe8d985c779261c44955c727b690d9c5c7..a2c27a1ff9d0ea15b0a9568f55bc09529181983c 100644 (file)
--- a/libraries/liblutil/base64.c
+++ b/libraries/liblutil/base64.c
@@ -48,6 +48,7 @@
 
 #include <stdlib.h>
 #include <stddef.h>
+#include <ctype.h>
 
 #include <ac/string.h>
 
@@ -209,7 +210,7 @@ b64_pton(
        tarindex = 0;
 
        while ((ch = *src++) != '\0') {
-               if (isspace(ch))        /* Skip whitespace anywhere. */
+               if (isascii(ch) && isspace(ch)) /* Skip whitespace anywhere. */
                        continue;
 
                if (ch == Pad64)
@@ -279,7 +280,7 @@ b64_pton(
                case 2:         /* Valid, means one byte of info */
                        /* Skip any number of spaces. */
                        for ((void)NULL; ch != '\0'; ch = *src++)
-                               if (!isspace(ch))
+                               if (! (isascii(ch) && isspace(ch)))
                                        break;
                        /* Make sure there is another trailing = sign. */
                        if (ch != Pad64)
@@ -294,7 +295,7 @@ b64_pton(
                         * whitespace after it?
                         */
                        for ((void)NULL; ch != '\0'; ch = *src++)
-                               if (!isspace(ch))
+                               if (! (isascii(ch) && isspace(ch)))
                                        return (-1);
 
                        /*