diff options
Diffstat (limited to 'source/tdb/tdbutil.c')
| -rw-r--r-- | source/tdb/tdbutil.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/tdb/tdbutil.c b/source/tdb/tdbutil.c index 45ebdae3af0..4fcfb6185ae 100644 --- a/source/tdb/tdbutil.c +++ b/source/tdb/tdbutil.c @@ -40,14 +40,19 @@ static void gotalarm_sig(void) 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; + ret.dptr = CONST_DISCARD(char *, dptr); ret.dsize = dsize; return ret; } +TDB_DATA string_tdb_data(const char *string) +{ + return make_tdb_data(string, strlen(string)); +} + /**************************************************************************** Lock a chain with timeout (in seconds). ****************************************************************************/ @@ -57,7 +62,7 @@ static int tdb_chainlock_with_timeout_internal( TDB_CONTEXT *tdb, TDB_DATA key, /* Allow tdb_chainlock to be interrupted by an alarm. */ int ret; gotalarm = 0; - tdb_set_lock_alarm(&gotalarm); + tdb_set_lock_alarm(CONST_DISCARD(sig_atomic_t *, &gotalarm)); if (timeout) { CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig); |