svn commit: samba r15325 - in branches/SAMBA_4_0/source/lib/gencache: .

jelmer at samba.org jelmer at samba.org
Sat Apr 29 16:12:01 GMT 2006


Author: jelmer
Date: 2006-04-29 16:12:01 +0000 (Sat, 29 Apr 2006)
New Revision: 15325

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15325

Log:
Fix compiler warnings

Modified:
   branches/SAMBA_4_0/source/lib/gencache/gencache.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/gencache/gencache.c
===================================================================
--- branches/SAMBA_4_0/source/lib/gencache/gencache.c	2006-04-29 14:51:26 UTC (rev 15324)
+++ branches/SAMBA_4_0/source/lib/gencache/gencache.c	2006-04-29 16:12:01 UTC (rev 15325)
@@ -119,9 +119,9 @@
 	if (!valstr)
 		return False;
 
-	keybuf.dptr = strdup(keystr);
+	keybuf.dptr = (uint8_t *)strdup(keystr);
 	keybuf.dsize = strlen(keystr)+1;
-	databuf.dptr = strdup(valstr);
+	databuf.dptr = (uint8_t *)strdup(valstr);
 	databuf.dsize = strlen(valstr)+1;
 	DEBUG(10, ("Adding cache entry with key = %s; value = %s and timeout \
 	           = %s (%d seconds %s)\n", keybuf.dptr, value, ctime(&timeout),
@@ -171,9 +171,9 @@
 	           = %s\n", keystr, old_valstr, ctime(&old_timeout)));
 
 	asprintf(&datastr, CACHE_DATA_FMT, (int)timeout, valstr);
-	keybuf.dptr = strdup(keystr);
+	keybuf.dptr = (uint8_t *)strdup(keystr);
 	keybuf.dsize = strlen(keystr)+1;
-	databuf.dptr = strdup(datastr);
+	databuf.dptr = (uint8_t *)strdup(datastr);
 	databuf.dsize = strlen(datastr)+1;
 	DEBUGADD(10, ("New value = %s, new timeout = %s (%d seconds %s)", valstr,
 	              ctime(&timeout), (int)(timeout - time(NULL)),
@@ -210,7 +210,7 @@
 
 	if (!gencache_init()) return False;	
 	
-	keybuf.dptr = strdup(keystr);
+	keybuf.dptr = (uint8_t *)strdup(keystr);
 	keybuf.dsize = strlen(keystr)+1;
 	DEBUG(10, ("Deleting cache entry (key = %s)\n", keystr));
 	ret = tdb_delete(cache->tdb, keybuf);
@@ -243,13 +243,13 @@
 	if (!gencache_init())
 		return False;
 	
-	keybuf.dptr = strdup(keystr);
+	keybuf.dptr = (uint8_t *)strdup(keystr);
 	keybuf.dsize = strlen(keystr)+1;
 	databuf = tdb_fetch(cache->tdb, keybuf);
 	SAFE_FREE(keybuf.dptr);
 	
 	if (databuf.dptr && databuf.dsize > TIMEOUT_LEN) {
-		char* entry_buf = strndup(databuf.dptr, databuf.dsize);
+		char* entry_buf = strndup((char *)databuf.dptr, databuf.dsize);
 		char *v;
 		time_t t;
 		unsigned i;
@@ -323,7 +323,7 @@
 	
 	while (node) {
 		/* ensure null termination of the key string */
-		keystr = strndup(node->node_key.dptr, node->node_key.dsize);
+		keystr = strndup((char *)node->node_key.dptr, node->node_key.dsize);
 		
 		/* 
 		 * We don't use gencache_get function, because we need to iterate through
@@ -336,7 +336,7 @@
 			node = node->next;
 			continue;
 		}
-		entry = strndup(databuf.dptr, databuf.dsize);
+		entry = strndup((char *)databuf.dptr, databuf.dsize);
 		SAFE_FREE(databuf.dptr);
 		valstr = malloc_array_p(char, databuf.dsize - TIMEOUT_LEN);
 		sscanf(entry, CACHE_DATA_FMT, (int*)(&i), valstr);



More information about the samba-cvs mailing list