svn commit: samba r4022 - in
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .
metze at samba.org
metze at samba.org
Tue Nov 30 22:55:37 GMT 2004
Author: metze
Date: 2004-11-30 22:55:36 +0000 (Tue, 30 Nov 2004)
New Revision: 4022
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4022
Log:
fix compiler warnings
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_pack.c
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c 2004-11-30 18:59:06 UTC (rev 4021)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c 2004-11-30 22:55:36 UTC (rev 4022)
@@ -80,7 +80,7 @@
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 @@
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;
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_pack.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_pack.c 2004-11-30 18:59:06 UTC (rev 4021)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_pack.c 2004-11-30 22:55:36 UTC (rev 4022)
@@ -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 @@
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);
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2004-11-30 18:59:06 UTC (rev 4021)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_search.c 2004-11-30 22:55:36 UTC (rev 4022)
@@ -353,7 +353,7 @@
*/
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;
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h 2004-11-30 18:59:06 UTC (rev 4021)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.h 2004-11-30 22:55:36 UTC (rev 4022)
@@ -90,7 +90,7 @@
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,
More information about the samba-cvs
mailing list