Remove unused variables

diff --git a/servers/slapd/tools/centipede.c b/servers/slapd/tools/centipede.c
index 022d950878f5b76efd1d3875e7338d3e6e8b1a4c..536417b43f7b8ccbce36aff62452662ebf18af57 100644 (file)
--- a/servers/slapd/tools/centipede.c
+++ b/servers/slapd/tools/centipede.c
@@ -1045,8 +1045,6 @@ charray_add_dup(
        char    *s
 )
 {
-       int n;
- 
        if ( *a == NULL ) {
                *a = (char **) malloc( (BUFSIZ + 1) * sizeof(char *) );
                *cur = 0;

diff --git a/servers/slapd/tools/ldif2id2children-bdb2.c b/servers/slapd/tools/ldif2id2children-bdb2.c
index e75c5f47d9f54057f8cda4b75cd48cda8beda8b6..1d3e01be2029052ed2a5a53b4a42fd66de50e394 100644 (file)
--- a/servers/slapd/tools/ldif2id2children-bdb2.c
+++ b/servers/slapd/tools/ldif2id2children-bdb2.c
@@ -29,9 +29,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, cargc, indb, stop, status;
-       char            *cargv[MAXARGS];
-       char            *defargv[MAXARGS];
+       int             i, stop;
        char            *linep, *buf;
        char            line[BUFSIZ];
        int             lineno, elineno;
@@ -43,7 +41,6 @@ main( int argc, char **argv )
        struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
-       Avlnode         *avltypes = NULL;
 
        tailorfile = SLAPD_DEFAULT_CONFIGFILE;
        dbnum = -1;

diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index 2f26509dcc2d9007f7948998acd0e542de43e1c7..16418a8d34f8fe8f74c8dc1940413994aa0400ba 100644 (file)
--- a/servers/slapd/tools/ldif2id2children.c
+++ b/servers/slapd/tools/ldif2id2children.c
@@ -29,9 +29,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, cargc, indb, stop, status;
-       char            *cargv[MAXARGS];
-       char            *defargv[MAXARGS];
+       int             i, stop;
        char            *linep, *buf;
        char            line[BUFSIZ];
        int             lineno, elineno;
@@ -43,7 +41,6 @@ main( int argc, char **argv )
        struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
-       Avlnode         *avltypes = NULL;
 
        tailorfile = SLAPD_DEFAULT_CONFIGFILE;
        dbnum = -1;

diff --git a/servers/slapd/tools/ldif2id2entry-bdb2.c b/servers/slapd/tools/ldif2id2entry-bdb2.c
index fef6d6e460f97de08162da7a5fb40760917964ca..b46cf26e8b57905018f046bd8a3a418253b5d293 100644 (file)
--- a/servers/slapd/tools/ldif2id2entry-bdb2.c
+++ b/servers/slapd/tools/ldif2id2entry-bdb2.c
@@ -27,10 +27,8 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, cargc, indb, stop, status;
-       char            *cargv[MAXARGS];
-       char            *defargv[MAXARGS];
-       char            *linep, *buf;
+       int             i, stop;
+       char            *buf;
        char            line[BUFSIZ], idbuf[BUFSIZ];
        int             lmax, lcur;
        int             dbnum;
@@ -40,7 +38,6 @@ main( int argc, char **argv )
        struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
-       Avlnode         *avltypes = NULL;
        FILE            *fp;
 
        tailorfile = SLAPD_DEFAULT_CONFIGFILE;
@@ -125,8 +122,6 @@ main( int argc, char **argv )
        vals[0] = &bv;
        vals[1] = NULL;
        while ( ! stop ) {
-               char            *type, *val, *s;
-               int             vlen;
                Datum           key, data;
 
                ldbm_datum_init( key );

diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c
index 3d50040e0f73f6a1f0bbf11d654c7549c34023f1..7dbf064f472e4ab334c4f4ec6eef2b8405c1dba8 100644 (file)
--- a/servers/slapd/tools/ldif2id2entry.c
+++ b/servers/slapd/tools/ldif2id2entry.c
@@ -27,10 +27,8 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, cargc, indb, stop, status;
-       char            *cargv[MAXARGS];
-       char            *defargv[MAXARGS];
-       char            *linep, *buf;
+       int             i, stop;
+       char            *buf;
        char            line[BUFSIZ], idbuf[BUFSIZ];
        int             lmax, lcur;
        int             dbnum;
@@ -40,7 +38,6 @@ main( int argc, char **argv )
        struct ldbminfo *li;
        struct berval   bv;
        struct berval   *vals[2];
-       Avlnode         *avltypes = NULL;
        FILE            *fp;
 
        tailorfile = SLAPD_DEFAULT_CONFIGFILE;
@@ -125,8 +122,6 @@ main( int argc, char **argv )
        vals[0] = &bv;
        vals[1] = NULL;
        while ( ! stop ) {
-               char            *type, *val, *s;
-               int             vlen;
                Datum           key, data;
 
                ldbm_datum_init( key );

diff --git a/servers/slapd/tools/ldif2index-bdb2.c b/servers/slapd/tools/ldif2index-bdb2.c
index cedb124baedd7b377fa90db8cce09c9a6aa22603..298906f1933d7b7e8e3cf52dca3b44fd7e3c5119 100644 (file)
--- a/servers/slapd/tools/ldif2index-bdb2.c
+++ b/servers/slapd/tools/ldif2index-bdb2.c
@@ -26,9 +26,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, cargc, indb, stop;
-       char            *cargv[MAXARGS];
-       char            *defargv[MAXARGS];
+       int             i, stop;
        char            *tailorfile, *inputfile;
        char            *linep, *buf, *attr;
        char            line[BUFSIZ];

diff --git a/servers/slapd/tools/ldif2index.c b/servers/slapd/tools/ldif2index.c
index 7032ea63c3685974de73fbc26cd6baf2fc0e2e6c..0bba2cdeb20823e396243e5e4ce89952304950f1 100644 (file)
--- a/servers/slapd/tools/ldif2index.c
+++ b/servers/slapd/tools/ldif2index.c
@@ -26,9 +26,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, cargc, indb, stop;
-       char            *cargv[MAXARGS];
-       char            *defargv[MAXARGS];
+       int             i, stop;
        char            *tailorfile, *inputfile;
        char            *linep, *buf, *attr;
        char            line[BUFSIZ];

diff --git a/servers/slapd/tools/ldif2ldbm-bdb2.c b/servers/slapd/tools/ldif2ldbm-bdb2.c
index ae1b64cb352fc14de3e603e887225c917a28320e..b5e2309af5c4f70ba383e71baf6926b0b7bab04e 100644 (file)
--- a/servers/slapd/tools/ldif2ldbm-bdb2.c
+++ b/servers/slapd/tools/ldif2ldbm-bdb2.c
@@ -23,7 +23,6 @@
 static void fork_child( char *prog, char *args[] );
 static void    wait4kids( int nkidval );
 
-static char    *indexcmd;
 static char    *tailorfile;
 static char    *inputfile;
 static int      maxkids = 1;
@@ -39,7 +38,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, stop, status;
+       int             i, stop;
        char            *linep, *buf, *sbindir;
        char            *args[MAXARGS];
        char            buf2[20], buf3[20];
@@ -216,10 +215,6 @@ main( int argc, char **argv )
        while ( ! stop ) {
                char            *type, *val, *s;
                int             vlen, indexmask, syntaxmask;
-               Datum           key, data;
-
-               ldbm_datum_init( key );
-               ldbm_datum_init( data );
 
                if ( fgets( line, sizeof(line), stdin ) != NULL ) {
                        int     len;
@@ -282,7 +277,7 @@ main( int argc, char **argv )
 static void
 fork_child( char *prog, char *args[] )
 {
-       int     status, pid;
+       int     pid;
 
        wait4kids( maxkids );
 

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index 9cbdf52b378f9573bed46b992a53e29ccbdde2e4..834980e62aa2bac0fbbb40ea96067c1867f2ce4a 100644 (file)
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -23,7 +23,6 @@
 static void fork_child( char *prog, char *args[] );
 static void    wait4kids( int nkidval );
 
-static char    *indexcmd;
 static char    *tailorfile;
 static char    *inputfile;
 static int      maxkids = 1;
@@ -39,7 +38,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, stop, status;
+       int             i, stop;
        char            *linep, *buf, *sbindir;
        char            *args[MAXARGS];
        char            buf2[20], buf3[20];
@@ -216,10 +215,6 @@ main( int argc, char **argv )
        while ( ! stop ) {
                char            *type, *val, *s;
                int             vlen, indexmask, syntaxmask;
-               Datum           key, data;
-
-               ldbm_datum_init( key );
-               ldbm_datum_init( data );
 
                if ( fgets( line, sizeof(line), stdin ) != NULL ) {
                        int     len;
@@ -282,7 +277,7 @@ main( int argc, char **argv )
 static void
 fork_child( char *prog, char *args[] )
 {
-       int     status, pid;
+       int     pid;
 
        wait4kids( maxkids );
 

diff --git a/servers/slurpd/fm.c b/servers/slurpd/fm.c
index 5523616ed16d0984ef5a41054b69e3968ad2bb27..0cb813caca42e86d1f30255f7f3f0857ecc0d1a1 100644 (file)
--- a/servers/slurpd/fm.c
+++ b/servers/slurpd/fm.c
@@ -171,7 +171,6 @@ populate_queue(
 )
 {
     FILE       *fp, *lfp;
-    Rq         *rq = sglob->rq;
     char       *p;
 
     if ( acquire_lock( f, &fp, &lfp ) < 0 ) {

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index cc094ba44670b69580276b5c9b7d410153777dfc..3e3c81175680fad3f9b488df63238d9ba73a1147 100644 (file)
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -36,7 +36,6 @@ main(
     return( 1 );
 #else
 
-    int                        status;
     int                        i;
 
     /* 

diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index d2adaae55eb9cf901e9c71b61dcc045dc5115d78..7e3031865cfd5b54789f3ce6f5ffdcb3a72cc2db 100644 (file)
--- a/tests/progs/slapd-addel.c
+++ b/tests/progs/slapd-addel.c
@@ -34,7 +34,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, j;
+       int             i;
        char        *host = "localhost";
        int                     port = -1;
        char            *manager = NULL;

diff --git a/tests/progs/slapd-read.c b/tests/progs/slapd-read.c
index 2e15ce3decda7e029e130cc70b43489c7d12e37c..6564b936a1b4a714471f5387e36d31f89d0eea29 100644 (file)
--- a/tests/progs/slapd-read.c
+++ b/tests/progs/slapd-read.c
@@ -30,7 +30,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, j;
+       int             i;
        char        *host = "localhost";
        int                     port = -1;
        char            *entry = NULL;

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 4b82c6d6b12bcf940526e68fffba7816fad9b3bd..88f2ebef5686b3d27bf9a2ec18dd1932071ba57c 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -30,7 +30,7 @@ usage( char *name )
 int
 main( int argc, char **argv )
 {
-       int             i, j;
+       int             i;
        char        *host = "localhost";
        int                     port = -1;
        char        *sbase = NULL;

diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index 801b4574662b0573f84c0ebe5748c04a37dc2704..51f8bee1701e1d152156842f4dd532386ad63c73 100644 (file)
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -305,7 +305,7 @@ get_read_entries( char *filename, char *entries[] )
 static void
 fork_child( char *prog, char *args[] )
 {
-       int     status, pid;
+       int     pid;
 
        wait4kids( maxkids );