svn commit: samba r5767 - in branches/SAMBA_3_0/source: passdb tdb

[vlendec at samba.org]

Author: vlendec
Date: 2005-03-12 09:49:23 +0000 (Sat, 12 Mar 2005)
New Revision: 5767

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

Log:
Get rid of some compiler warnings
Modified:
   branches/SAMBA_3_0/source/passdb/secrets.c
   branches/SAMBA_3_0/source/tdb/tdbutil.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/secrets.c	2005-03-12 09:25:39 UTC (rev 5766)
+++ branches/SAMBA_3_0/source/passdb/secrets.c	2005-03-12 09:49:23 UTC (rev 5767)
@@ -84,13 +84,11 @@
  */
 void *secrets_fetch(const char *key, size_t *size)
 {
-	TDB_DATA kbuf, dbuf;
+	TDB_DATA dbuf;
 	secrets_init();
 	if (!tdb)
 		return NULL;
-	kbuf.dptr = (char *)key;
-	kbuf.dsize = strlen(key);
-	dbuf = tdb_fetch(tdb, kbuf);
+	dbuf = tdb_fetch(tdb, string_tdb_data(key));
 	if (size)
 		*size = dbuf.dsize;
 	return dbuf.dptr;
@@ -100,15 +98,11 @@
  */
 BOOL secrets_store(const char *key, const void *data, size_t size)
 {
-	TDB_DATA kbuf, dbuf;
 	secrets_init();
 	if (!tdb)
 		return False;
-	kbuf.dptr = (char *)key;
-	kbuf.dsize = strlen(key);
-	dbuf.dptr = (char *)data;
-	dbuf.dsize = size;
-	return tdb_store(tdb, kbuf, dbuf, TDB_REPLACE) == 0;
+	return tdb_store(tdb, string_tdb_data(key), make_tdb_data(data, size),
+			 TDB_REPLACE) == 0;
 }
 
 
@@ -116,13 +110,10 @@
  */
 BOOL secrets_delete(const char *key)
 {
-	TDB_DATA kbuf;
 	secrets_init();
 	if (!tdb)
 		return False;
-	kbuf.dptr = (char *)key;
-	kbuf.dsize = strlen(key);
-	return tdb_delete(tdb, kbuf) == 0;
+	return tdb_delete(tdb, string_tdb_data(key)) == 0;
 }
 
 BOOL secrets_store_domain_sid(const char *domain, const DOM_SID *sid)

Modified: branches/SAMBA_3_0/source/tdb/tdbutil.c
===================================================================
--- branches/SAMBA_3_0/source/tdb/tdbutil.c	2005-03-12 09:25:39 UTC (rev 5766)
+++ branches/SAMBA_3_0/source/tdb/tdbutil.c	2005-03-12 09:49:23 UTC (rev 5767)
@@ -40,7 +40,7 @@
  Make a TDB_DATA and keep the const warning in one place
 ****************************************************************/
 
-static TDB_DATA make_tdb_data(const char *dptr, size_t dsize)
+TDB_DATA make_tdb_data(const char *dptr, size_t dsize)
 {
 	TDB_DATA ret;
 	ret.dptr = dptr;
@@ -48,6 +48,11 @@
 	return ret;
 }
 
+TDB_DATA string_tdb_data(const char *string)
+{
+	return make_tdb_data(string, strlen(string));
+}
+
 /****************************************************************************
  Lock a chain with timeout (in seconds).
 ****************************************************************************/