Commit 94c87633 authored by Rusty Russell's avatar Rusty Russell

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

Samba uses these flags, so be friendly.
parent f1069e4a
......@@ -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);
......
......@@ -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];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment