diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-03-23 15:32:01 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-03-23 15:32:01 +1030 |
| commit | 94c8763345a51fe59e97daf4e29051f56331c63c (patch) | |
| tree | 172ff7785ad9b0a2fefca9b3842ec6c2f00be900 | |
| parent | f1069e4a2d5a8115695fb8ea3e78dbdcf389aead (diff) | |
tdb2: fix tools warnings with -Wshadow and -Wcast-qual.
Samba uses these flags, so be friendly.
| -rw-r--r-- | ccan/tdb2/tools/tdbtool.c | 9 | ||||
| -rw-r--r-- | ccan/tdb2/tools/tdbtorture.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ccan/tdb2/tools/tdbtool.c b/ccan/tdb2/tools/tdbtool.c index a00ebb90..15ae052c 100644 --- a/ccan/tdb2/tools/tdbtool.c +++ b/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); diff --git a/ccan/tdb2/tools/tdbtorture.c b/ccan/tdb2/tools/tdbtorture.c index 52cab665..c6b71de5 100644 --- a/ccan/tdb2/tools/tdbtorture.c +++ b/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]; |