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

diff --git a/source/printing/printing.c b/source/printing/printing.c
index b6c4969761b2b4296a27b5a6380e85b9c578806f..cff6eb62ef559c1b02b82e147c75a3cb684fe6fe 100644 (file)
--- a/source/printing/printing.c
+++ b/source/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",