r4022: fix compiler warnings

metze

diff --git a/source/lib/ldb/ldb_tdb/ldb_index.c b/source/lib/ldb/ldb_tdb/ldb_index.c
index b651aa38c192bfed178961fb0fe07082ddc2a6a9..df0a436172d85fbc89c9dee948af7b9be7a1659e 100644 (file)
--- a/source/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source/lib/ldb/ldb_tdb/ldb_index.c
@@ -80,7 +80,7 @@ static char *ldb_dn_key(struct ldb_context *ldb,
   see if a attribute value is in the list of indexed attributes
 */
 static int ldb_msg_find_idx(const struct ldb_message *msg, const char *attr,
-                           int *v_idx, const char *key)
+                           unsigned int *v_idx, const char *key)
 {
        unsigned int i, j;
        for (i=0;i<msg->num_elements;i++) {
@@ -509,7 +509,8 @@ static int ldb_index_filter(struct ldb_module *module, struct ldb_parse_tree *tr
                            const struct dn_list *dn_list, 
                            const char * const attrs[], struct ldb_message ***res)
 {
-       unsigned int count = 0, i;
+       unsigned int i;
+       int count = 0;
 
        for (i=0;i<dn_list->count;i++) {
                struct ldb_message msg;

diff --git a/source/lib/ldb/ldb_tdb/ldb_pack.c b/source/lib/ldb/ldb_tdb/ldb_pack.c
index 9515beeaa78db78994a28a51294f8a202e90e51b..bfbc4841a63a7095fc95fa7752ef2446bcd747b8 100644 (file)
--- a/source/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/source/lib/ldb/ldb_tdb/ldb_pack.c
@@ -44,7 +44,7 @@
 #define LTDB_PACKING_FORMAT_NODN 0x26011966
 
 /* use a portable integer format */
-static void put_uint32(uint8_t *p, int ofs, unsigned int val)
+static void put_uint32(char *p, int ofs, unsigned int val)
 {
        p += ofs;
        p[0] = val&0xFF;
@@ -53,7 +53,7 @@ static void put_uint32(uint8_t *p, int ofs, unsigned int val)
        p[3] = (val>>24) & 0xFF;
 }
 
-static unsigned int pull_uint32(uint8_t *p, int ofs)
+static unsigned int pull_uint32(char *p, int ofs)
 {
        p += ofs;
        return p[0] | (p[1]<<8) | (p[2]<<16) | (p[3]<<24);

diff --git a/source/lib/ldb/ldb_tdb/ldb_search.c b/source/lib/ldb/ldb_tdb/ldb_search.c
index 903c4cb80210e6afe97b4d254ddc378c7c450020..27718a4c8684bdd1d45536ca5822b884943ce896 100644 (file)
--- a/source/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source/lib/ldb/ldb_tdb/ldb_search.c
@@ -353,7 +353,7 @@ int ltdb_search_dn(struct ldb_module *module, char *dn,
 */
 int ltdb_add_attr_results(struct ldb_module *module, struct ldb_message *msg,
                          const char * const attrs[], 
-                         unsigned int *count, 
+                         int *count, 
                          struct ldb_message ***res)
 {
        struct ldb_context *ldb = module->ldb;

diff --git a/source/lib/ldb/ldb_tdb/ldb_tdb.h b/source/lib/ldb/ldb_tdb/ldb_tdb.h
index 7b926e21a2633a7d9083d6eed3b881d4b85a9020..2cc25b31522a9ae1ba68cbea756d45e46d256f86 100644 (file)
--- a/source/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -90,7 +90,7 @@ int ltdb_search_dn(struct ldb_module *module, char *dn,
                   const char * const attrs[], struct ldb_message ***res);
 int ltdb_add_attr_results(struct ldb_module *module, struct ldb_message *msg,
                          const char * const attrs[], 
-                         unsigned int *count, 
+                         int *count, 
                          struct ldb_message ***res);
 int ltdb_search_free(struct ldb_module *module, struct ldb_message **msgs);
 int ltdb_search(struct ldb_module *module, const char *base,