[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools dbscan.c, 1.17, 1.18 mmldif.c, 1.7, 1.8

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/ldap/servers/slapd/tools

Modified Files:
	dbscan.c mmldif.c 
Log Message:
Resolves: #188320
Summary: HP-UX: warnings reported by the HP-UX compiler



Index: dbscan.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/dbscan.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dbscan.c	24 Sep 2007 23:39:23 -0000	1.17
+++ dbscan.c	18 Oct 2007 00:08:34 -0000	1.18
@@ -66,6 +66,12 @@
 #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 @@
         }
         if (truncatesiz > 0 && o > bufend - 5) {
             /* truncate it */
-            strcpy(o, " ...");
+            strcpy((char *)o, " ...");
             i = len;
             o += 4;
         }
@@ -416,9 +422,7 @@
     uint32 i;
     uint32 val_count;
     char *type = NULL;
-    int op;
 
-    op = (*pos) & 0x000000FF;
     pos ++;
     _cl5ReadString (&type, &pos);
 
@@ -440,7 +444,7 @@
 /* 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 @@
         } 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);


Index: mmldif.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/mmldif.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mmldif.c	10 Nov 2006 23:45:51 -0000	1.7
+++ mmldif.c	18 Oct 2007 00:08:34 -0000	1.8
@@ -290,7 +290,6 @@
 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 @@
 
     time(&tl);
     seed = (char)tl;
-    maxcount = 10;
     ndirectories = 0;
     emitchanges = 0;
     ofp = NULL;