Resolves: #188320

Summary: HP-UX: warnings reported by the HP-UX compiler

5 files changed, 11 insertions, 11 deletions

diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index 775bb43d..e5b6de5a 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -66,6 +66,12 @@ typedef unsigned char uint8_t;
 #include <inttypes.h>
 #endif
 
+#if ( defined( hpux ) )
+#ifdef _XOPEN_SOURCE_EXTENDED
+#include <arpa/inet.h>	/* for ntohl, et al. */
+#endif
+#endif
+
 /* file type */
 #define ENTRYTYPE     0x1
 #define INDEXTYPE     0x2
@@ -227,7 +233,7 @@ static char *format_raw(unsigned char *s, int len, int flags,
         }
         if (truncatesiz > 0 && o > bufend - 5) {
             /* truncate it */
-            strcpy(o, " ...");
+            strcpy((char *)o, " ...");
             i = len;
             o += 4;
         }
@@ -416,9 +422,7 @@ void _cl5ReadMod(char **buff)
     uint32 i;
     uint32 val_count;
     char *type = NULL;
-    int op;
 
-    op = (*pos) & 0x000000FF;
     pos ++;
     _cl5ReadString (&type, &pos);
 
@@ -440,7 +444,7 @@ void _cl5ReadMod(char **buff)
 /* data format: <value count> <value size> <value> <value size> <value> ..... */
 void print_ruv(unsigned char *buff)
 {
-    char *pos = buff;
+    char *pos = (char *)buff;
     uint32 i;
     uint32 val_count;
 
@@ -942,7 +946,7 @@ int main(int argc, char **argv)
         } while (0 == ret);
         key.size = 0;
         key.data = NULL;
-    } else if (entry_id != -1) {
+    } else if (entry_id != 0xffffffff) {
         key.size = sizeof(entry_id);
         key.data = &entry_id;
         ret = db->get(db, NULL, &key, &data, 0);
diff --git a/ldap/servers/slapd/tools/ldclt/ldapfct.c b/ldap/servers/slapd/tools/ldclt/ldapfct.c
index 32e5371a..33037734 100644
--- a/ldap/servers/slapd/tools/ldclt/ldapfct.c
+++ b/ldap/servers/slapd/tools/ldclt/ldapfct.c
@@ -629,7 +629,7 @@ connectToServer (
       if (close ((int)fd) < 0)
       {
 	perror ("ldctx");
-	printf ("ldclt[%d]: T%03d: cannot close(fd=%d), error=%d (%s)\n",
+	printf ("ldclt[%d]: T%03d: cannot close(fd=%ld), error=%d (%s)\n",
 		mctx.pid, tttctx->thrdNum, fd, errno, strerror (errno));
 	return (-1);
       }
diff --git a/ldap/servers/slapd/tools/ldclt/scalab01.c b/ldap/servers/slapd/tools/ldclt/scalab01.c
index 45974e02..2228a852 100644
--- a/ldap/servers/slapd/tools/ldclt/scalab01.c
+++ b/ldap/servers/slapd/tools/ldclt/scalab01.c
@@ -1019,7 +1019,6 @@ scalab01_control (
   /*
    * End of thread
    */
-  return (arg);
 }
 
 
diff --git a/ldap/servers/slapd/tools/mmldif.c b/ldap/servers/slapd/tools/mmldif.c
index fb820823..19b039b1 100644
--- a/ldap/servers/slapd/tools/mmldif.c
+++ b/ldap/servers/slapd/tools/mmldif.c
@@ -290,7 +290,6 @@ static char	line[2048];
 static char	seed;
 static int	hashmask;
 static entry_t **hashtable;
-static int	maxcount;
 static int      emitchanges;
 
 static int readrec(edfFILE * edf1, attrib1_t ** attrib); 
@@ -641,7 +640,6 @@ int mm_init(int argc, char * argv[])
 
     time(&tl);
     seed = (char)tl;
-    maxcount = 10;
     ndirectories = 0;
     emitchanges = 0;
     ofp = NULL;
diff --git a/ldap/servers/slapd/tools/rsearch/infadd.c b/ldap/servers/slapd/tools/rsearch/infadd.c
index 039f85cb..f4a8aedf 100644
--- a/ldap/servers/slapd/tools/rsearch/infadd.c
+++ b/ldap/servers/slapd/tools/rsearch/infadd.c
@@ -223,8 +223,7 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-    if (use_random < 0 || sampleInterval <= 0 || thread_count <= 0 ||
-                lmtCount < 0 || blobsize < 0 || firstUID < 0) {
+    if ( sampleInterval <= 0 || thread_count <= 0 || lmtCount < 0 ) {
         printf("infadd: invalid option value\n");
         usage();
         exit(-1);