Clean up lint.

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 9894aa428ecc7ae708b666e70a89755954560fd6..f512bd3b1ff368e7221d185dd2fb250829276a2f 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -98,7 +98,7 @@ main( int argc, char **argv )
     authmethod = -1;
        version = -1;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : ++prog;
+    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
 
     while (( i = getopt( argc, argv, "cf:r" "Cd:D:h:IkKMnO:p:P:QRU:vw:WxX:Y:Z" )) != EOF ) {
        switch( i ) {
@@ -570,7 +570,7 @@ main( int argc, char **argv )
                c.ldctl_value.bv_len = 0;
                c.ldctl_iscritical = manageDSAit > 1;
 
-               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
 
                if( err != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set ManageDSAit %scontrol\n",

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 910e0466eb520eeed1c99fa5003ad819c50f82ef..b8245cce2d960cc1dde52904f02b3c0839246ec7 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -640,7 +640,7 @@ main( int argc, char **argv )
                c.ldctl_value.bv_len = 0;
                c.ldctl_iscritical = manageDSAit > 1;
 
-               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
 
                if( err != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set ManageDSAit %scontrol\n",

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index b93490912092a27151a11877f3bf7efbc61e0dc9..6642dd5fc4614a0b98fdc1264474432ad65d6735 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -114,7 +114,7 @@ main(int argc, char **argv)
     authmethod = LDAP_AUTH_SIMPLE;
        version = -1;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : ++prog;
+    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
 
     while (( i = getopt( argc, argv, "cf:rs:" "Cd:D:h:IkKMnO:p:P:QRU:vw:WxX:Y:Z" )) != EOF ) {
        switch( i ) {
@@ -607,7 +607,7 @@ main(int argc, char **argv)
                c.ldctl_value.bv_len = 0;
                c.ldctl_iscritical = manageDSAit > 1;
 
-               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
 
                if( err != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set ManageDSAit %scontrol\n",

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 32c8650cd3641f6d3c5183e4c027f24f22952f89..578463598c4601e2e66d934ef02756a7c40fc996 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -105,7 +105,7 @@ main( int argc, char *argv[] )
        char    *retoid = NULL;
        struct berval *retdata = NULL;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : ++prog;
+    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
 
        if (argc == 1)
                usage (argv[0]);

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 9c4c434cdd7f7718c349d25c6303d1eaf09cb539..7d1b27e3acffffdebef489124c8b0c29e5032e25 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -177,7 +177,7 @@ main( int argc, char **argv )
        scope = LDAP_SCOPE_SUBTREE;
        authmethod = -1;
 
-    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : ++prog;
+    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
 
        while (( i = getopt( argc, argv,
                "Aa:b:f:Ll:S:s:T:tuV:z:" "Cd:D:h:IkKMnO:p:P:QRU:vw:WxX:Y:Z")) != EOF )
@@ -763,7 +763,7 @@ main( int argc, char **argv )
                c.ldctl_value.bv_len = 0;
                c.ldctl_iscritical = manageDSAit > 1;
 
-               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, &ctrls );
+               err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
 
                if( err != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set ManageDSAit %scontrol\n",