summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-03-31 08:14:37 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-03-31 08:14:37 +0000
commit1e4aaa5a7210f6da9762bd12811841668d5fdc3f (patch)
tree2fe998a8827fe6ae9c65c40f91cce9128248956d
parent836454ed58709f92a2b731f118532bab7d012e34 (diff)
downloadsamba-1e4aaa5a7210f6da9762bd12811841668d5fdc3f.tar.gz
samba-1e4aaa5a7210f6da9762bd12811841668d5fdc3f.tar.bz2
samba-1e4aaa5a7210f6da9762bd12811841668d5fdc3f.zip
Fix a botched merge from appliance-head...
We have an extra NULL here, which is (if I understand correctly) related to a optional 'charset conversion' function. In any case, as this is a variable args length function, the compiler didn't pick it up. Would it be possible to change applicance_head (or even HEAD) in such a way that this extra arg would cause a warning? Finding this by testing is getting painful... Andrew Bartlett (This used to be commit b4e52d90f8a207b5cd7415abb5915c3ac0c65dfc)
-rw-r--r--source3/printing/printing.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index b6c4969761..cff6eb62ef 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -835,7 +835,7 @@ static void store_queue_struct(struct tdb_print_db *pdb, struct traverse_struct
/* Work out the size. */
data.dsize = 0;
- data.dsize += tdb_pack(NULL, 0, NULL, "d", qcount);
+ data.dsize += tdb_pack(NULL, 0, "d", qcount);
for (i = 0; i < pts->qcount; i++) {
data.dsize += tdb_pack(NULL, 0, "ddddddff",