Browse Source

tdb2: fix tools warnings with -Wshadow and -Wcast-qual.

Samba uses these flags, so be friendly.
Rusty Russell 15 years ago
parent
commit
94c8763345
2 changed files with 4 additions and 7 deletions
  1. 3 6
      ccan/tdb2/tools/tdbtool.c
  2. 1 1
      ccan/tdb2/tools/tdbtorture.c

+ 3 - 6
ccan/tdb2/tools/tdbtool.c

@@ -454,8 +454,7 @@ static void speed_tdb(const char *tlimit)
 	do {
 		long int r = random();
 		TDB_DATA key, dbuf;
-		key.dptr = (unsigned char *)"store test";
-		key.dsize = strlen((char *)key.dptr);
+		key = tdb_mkdata("store test", strlen("store test"));
 		dbuf.dptr = (unsigned char *)&r;
 		dbuf.dsize = sizeof(r);
 		tdb_store(tdb, key, dbuf, TDB_REPLACE);
@@ -470,8 +469,7 @@ static void speed_tdb(const char *tlimit)
 	do {
 		long int r = random();
 		TDB_DATA key, dbuf;
-		key.dptr = (unsigned char *)"store test";
-		key.dsize = strlen((char *)key.dptr);
+		key = tdb_mkdata("store test", strlen("store test"));
 		dbuf.dptr = (unsigned char *)&r;
 		dbuf.dsize = sizeof(r);
 		tdb_fetch(tdb, key, &dbuf);
@@ -486,8 +484,7 @@ static void speed_tdb(const char *tlimit)
 	do {
 		long int r = random();
 		TDB_DATA key, dbuf;
-		key.dptr = (unsigned char *)"transaction test";
-		key.dsize = strlen((char *)key.dptr);
+		key = tdb_mkdata("transaction test", strlen("transaction test"));
 		dbuf.dptr = (unsigned char *)&r;
 		dbuf.dsize = sizeof(r);
 		tdb_transaction_start(tdb);

+ 1 - 1
ccan/tdb2/tools/tdbtorture.c

@@ -60,7 +60,7 @@ static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
 
 #include "../private.h"
 
-static void segv_handler(int signal, siginfo_t *info, void *p)
+static void segv_handler(int sig, siginfo_t *info, void *p)
 {
 	char string[100];