summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-15 20:27:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:02 -0500
commitcacc3e18885f55a49a066d5e3eb602473ea76898 (patch)
tree31de2df7ec013cf42c2c4010246ccee6421c221d /source3
parentd177f1bc8f0cb5ad91c9146871ba2e93eb2988d2 (diff)
downloadsamba-cacc3e18885f55a49a066d5e3eb602473ea76898.tar.gz
samba-cacc3e18885f55a49a066d5e3eb602473ea76898.tar.bz2
samba-cacc3e18885f55a49a066d5e3eb602473ea76898.zip
r5807: fix segfault after compiler warning clean up (and cleanup another warning)
(This used to be commit 2dae527e217ff9da2ad9f434bf1280744e93fad7)
Diffstat (limited to 'source3')
-rw-r--r--source3/printing/printing.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index b45a31a1c7..26d4311770 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1032,7 +1032,7 @@ static BOOL print_cache_expired(const char *sharename, BOOL check_pending)
snprintf(key, sizeof(key), "MSG_PENDING/%s", sharename);
if ( check_pending
- && tdb_fetch_uint32( pdb->tdb, key, &msg_pending_time )
+ && tdb_fetch_uint32( pdb->tdb, key, (uint32*)&msg_pending_time )
&& msg_pending_time > 0
&& msg_pending_time <= time_now
&& (time_now - msg_pending_time) < 60 )
@@ -1735,9 +1735,9 @@ static BOOL remove_from_jobs_changed(const char* sharename, uint32 jobid)
ZERO_STRUCT(data);
- if (tdb_chainlock_with_timeout(pdb->tdb,
- string_tdb_data("INFO/jobs_changed"),
- 5) == -1)
+ key = string_tdb_data("INFO/jobs_changed");
+
+ if (tdb_chainlock_with_timeout(pdb->tdb, key, 5) == -1)
goto out;
gotlock = True;