From: Rémi Bernon rbernon@codeweavers.com
--- programs/winetest/send.c | 6 +++--- programs/winetest/util.c | 12 +++++++----- programs/winetest/winetest.h | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 257d9b75f1d..8c07f3b8ae7 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -30,7 +30,7 @@ #define URL_PATH "/submit" #define SEP "--8<--cut-here--8<--" #define CONTENT_HEADERS "Content-Type: multipart/form-data; boundary="" SEP ""\r\n" \ - "Content-Length: %u\r\n\r\n" + "Content-Length: %lu\r\n\r\n" static const char body1[] = "--" SEP "\r\n" "Content-Disposition: form-data; name="reportfile"; filename="%s"\r\n" "Content-Type: application/octet-stream\r\n\r\n"; @@ -218,7 +218,7 @@ send_file_direct (const char * url, const char *name) return 1; }
- str = strmake (&count, "Received %s (%d bytes).\n", + str = strmake (&count, "Received %s (%ld bytes).\n", name, filesize); ret = total < count || memcmp (str, buffer + total - count, count) != 0; free(str); @@ -412,7 +412,7 @@ send_file_wininet (const char *url, const char *name) while (bytes_read != 0);
free(str); - str = strmake (&count, "Received %s (%d bytes).\n", + str = strmake (&count, "Received %s (%ld bytes).\n", name, filesize); if (total < count || memcmp (str, buffer + total - count, count) != 0) { buffer[total] = 0; diff --git a/programs/winetest/util.c b/programs/winetest/util.c index bd5b584c3c4..f1f887020a1 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -50,7 +50,8 @@ char *xstrdup( const char *str ) return res; }
-static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) +static char *vstrfmtmake( size_t *lenp, const char *fmt, va_list ap ) __WINE_PRINTF_ATTR(2,0); +static char *vstrfmtmake( size_t *lenp, const char *fmt, va_list ap ) { size_t size = 1000; char *p; @@ -77,14 +78,15 @@ char *vstrmake (size_t *lenp, va_list ap) return vstrfmtmake (lenp, fmt, ap); }
-char * WINAPIV strmake (size_t *lenp, ...) +char *WINAPIV strmake( size_t *len, const char *fmt, ... ) __WINE_PRINTF_ATTR(2,3); +char *WINAPIV strmake( size_t *len, const char *fmt, ... ) { va_list ap; char *p;
- va_start (ap, lenp); - p = vstrmake (lenp, ap); - va_end (ap); + va_start( ap, fmt ); + p = vstrfmtmake( len, fmt, ap ); + va_end( ap ); return p; }
diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 60b661fd3b1..ab8898e7834 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -25,12 +25,14 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include "wine/debug.h" + +extern char *WINAPIV strmake( size_t *len, const char *fmt, ... ) __WINE_PRINTF_ATTR(2,3);
void fatal (const char* msg); void warning (const char* msg); void WINAPIV xprintf (const char *fmt, ...); char *vstrmake (size_t *lenp, va_list ap); -char * WINAPIV strmake (size_t *lenp, ...); int goodtagchar (char c); const char *findbadtagchar (const char *tag);