rpc_parse/parse_spoolss.c: Updated comment for old version of W2K.

tdb/tdbutil.c: With varargs uint16 is cast to (int).
Jeremy.

diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c
index d77cd938a86c9b061bc04974d41af62a244a0167..c4196b033412a3fdd438ef076f391754f9474193 100644 (file)
--- a/source/rpc_parse/parse_spoolss.c
+++ b/source/rpc_parse/parse_spoolss.c
@@ -4341,6 +4341,9 @@ BOOL spool_io_printer_driver_info_level_6(char *desc, SPOOL_PRINTER_DRIVER_INFO_
        if(!prs_uint32("version", ps, depth, &il->version))
                return False;
 #if 0
+       /*
+        * Older build versions of W2K seem to need this. JRA.
+        */
        if(!prs_uint32("dummy4", ps, depth, &il->dummy4))
                return False;
 #endif

diff --git a/source/tdb/tdbutil.c b/source/tdb/tdbutil.c
index ac7a5e2e9092dea9f30182be4f84c39ccdeaa2a6..92b8f9cbfb1bec1ce10226300f0748dbe6e8e409 100644 (file)
--- a/source/tdb/tdbutil.c
+++ b/source/tdb/tdbutil.c
@@ -140,7 +140,7 @@ size_t tdb_pack(char *buf, int bufsize, char *fmt, ...)
                switch ((c = *fmt++)) {
                case 'w':
                        len = 2;
-                       w = va_arg(ap, uint16);
+                       w = (uint16)va_arg(ap, int);
                        if (bufsize >= len) {
                                SSVAL(buf, 0, w);
                        }