Unexpand spaces for tabs in prior commit before merging to rel_eng_1_1.

diff --git a/servers/slapd/tools/centipede.c b/servers/slapd/tools/centipede.c
index 11e46ba469a071f6b88125a5102eaaebb498d7f3..48738aa074911494711f2fe208ba133ccecb483e 100644 (file)
--- a/servers/slapd/tools/centipede.c
+++ b/servers/slapd/tools/centipede.c
@@ -473,7 +473,7 @@ generate_new_centroids(
        char            **val;
        char            last;
 
-    memset( &data, 0 , sizeof( data ));
+       memset( &data, 0 , sizeof( data ));
 
        if ( verbose ) {
                printf( "Generating new centroids for..." );
@@ -498,7 +498,7 @@ generate_new_centroids(
                        /* for each value */
                        for ( j = 0; val[j] != NULL; j++ ) {
 
-                memset( &key, 0 , sizeof( key ));
+                               memset( &key, 0 , sizeof( key ));
 
                                /* normalize the value */
                                for ( s = val[j]; *s; s++ ) {
@@ -575,13 +575,13 @@ diff_centroids(
                fflush( stdout );
        }
 
-    memset( &okey, 0, sizeof( okey ));
-    memset( &nkey, 0, sizeof( nkey ));
-    memset( &olast, 0, sizeof( olast ));
-    memset( &nlast, 0, sizeof( nlast ));
-    memset( &lastkey, 0, sizeof( lastkey ));
-    memset( &key, 0, sizeof( key ));
-    memset( &data, 0, sizeof( data ));
+       memset( &okey, 0, sizeof( okey ));
+       memset( &nkey, 0, sizeof( nkey ));
+       memset( &olast, 0, sizeof( olast ));
+       memset( &nlast, 0, sizeof( nlast ));
+       memset( &lastkey, 0, sizeof( lastkey ));
+       memset( &key, 0, sizeof( key ));
+       memset( &data, 0, sizeof( data ));
 
        if ( (mods = (LDAPMod **) malloc( sizeof(LDAPMod *) * 4 )) == NULL ||
             (mods[0] = (LDAPMod *) malloc( sizeof(LDAPMod) )) == NULL ||
@@ -845,8 +845,8 @@ full_centroid(
                fflush( stdout );
        }
 
-    memset( &key, 0, sizeof( key ));
-    memset( &lastkey, 0, sizeof( lastkey ));
+       memset( &key, 0, sizeof( key ));
+       memset( &lastkey, 0, sizeof( lastkey ));
 
        if ( (mods = (LDAPMod **) malloc( sizeof(LDAPMod *) * 3 )) == NULL ||
             (mods[0] = (LDAPMod *) malloc( sizeof(LDAPMod) )) == NULL ||

diff --git a/servers/slapd/tools/ldbmcat.c b/servers/slapd/tools/ldbmcat.c
index 40208ab86e84857affa4c20d71ab601acb48b3e8..658bf98906edc775295b08349c76001c73c3b8bd 100644 (file)
--- a/servers/slapd/tools/ldbmcat.c
+++ b/servers/slapd/tools/ldbmcat.c
@@ -29,9 +29,9 @@ main( int argc, char **argv )
 #ifdef HAVE_BERKELEY_DB2
        DBC     *cursorp;
 
-    memset( &key, 0, sizeof( key ));
-    memset( &last, 0, sizeof( last ));
-    memset( &data, 0, sizeof( data ));
+       memset( &key, 0, sizeof( key ));
+       memset( &last, 0, sizeof( last ));
+       memset( &data, 0, sizeof( data ));
 #endif
 
        if ( argc < 2 || argc > 3 || ( argc == 3 && strcmp( argv[1], "-n" )

diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index c985d83daeee557e94796fdf3cde2f4ebeb8e1a9..9ff967dfa868e2a36fc456a953023b6e9b88cd45 100644 (file)
--- a/servers/slapd/tools/ldif2id2children.c
+++ b/servers/slapd/tools/ldif2id2children.c
@@ -154,8 +154,8 @@ main( int argc, char **argv )
                int             vlen;
                Datum           key, data;
 
-        memset( &key, 0, sizeof( key ));
-        memset( &data, 0, sizeof( data ));
+               memset( &key, 0, sizeof( key ));
+               memset( &data, 0, sizeof( data ));
 
                if ( fgets( line, sizeof(line), stdin ) != NULL ) {
                        int     len;
@@ -240,8 +240,8 @@ main( int argc, char **argv )
                char    buf2[20];
                Datum   key, data;
 
-        memset( &key, 0, sizeof( key ));
-        memset( &data, 0, sizeof( data ));
+               memset( &key, 0, sizeof( key ));
+               memset( &data, 0, sizeof( data ));
 
                if ( fgets( line, sizeof(line), stdin ) != NULL ) {
                        int     len;

diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c
index f91c50a799ad9e93c41ea282758ee32d82c870dc..2f46d3c5338f016bd4e43fe0740bb9787a67062d 100644 (file)
--- a/servers/slapd/tools/ldif2id2entry.c
+++ b/servers/slapd/tools/ldif2id2entry.c
@@ -146,8 +146,8 @@ main( int argc, char **argv )
                int             vlen;
                Datum           key, data;
 
-        memset( &key, 0, sizeof( key ));
-        memset( &data, 0, sizeof( data ));
+               memset( &key, 0, sizeof( key ));
+               memset( &data, 0, sizeof( data ));
 
                if ( fgets( line, sizeof(line), stdin ) != NULL ) {
                        int     len, idlen;

diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index c6df73f4a39066d94ccdec30aa845336a07b9e82..7f759367cc362d80de0661d205127cdc45cdf71b 100644 (file)
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -229,8 +229,8 @@ main( int argc, char **argv )
                int             vlen, indexmask, syntaxmask;
                Datum           key, data;
 
-        memset( &key, 0, sizeof( key ));
-        memset( &data, 0, sizeof( data ));
+               memset( &key, 0, sizeof( key ));
+               memset( &data, 0, sizeof( data ));
 
                if ( fgets( line, sizeof(line), stdin ) != NULL ) {
                        int     len;

diff --git a/servers/slapd/tools/sizecount.c b/servers/slapd/tools/sizecount.c
index 74cb7a6b4fc82b5c26b52757c74c0581bc921824..633b9529157ba06da31851dd7df4df683afc2b31 100644 (file)
--- a/servers/slapd/tools/sizecount.c
+++ b/servers/slapd/tools/sizecount.c
@@ -94,8 +94,8 @@ main( int argc, char **argv )
                                        Datum   key, data;
                                        char    *w;
 
-                    memset( &key, 0, sizeof( key ));
-                    memset( &data, 0, sizeof( data ));
+                                       memset( &key, 0, sizeof( key ));
+                                       memset( &data, 0, sizeof( data ));
 
                                        /* update value count */
                                        vcount++;