summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-09 10:29:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:05 -0500
commit4e99d06ee72ca032856e7c1200ebef9e0feab74f (patch)
treed3328cf4eafd20395ed8b802545b41aca29464c7
parente8c562741783f819b6fe7b99fb7f6b85d3f7ce58 (diff)
downloadsamba-4e99d06ee72ca032856e7c1200ebef9e0feab74f.tar.gz
samba-4e99d06ee72ca032856e7c1200ebef9e0feab74f.tar.bz2
samba-4e99d06ee72ca032856e7c1200ebef9e0feab74f.zip
r18304: fixed misuse of size_t in dopr()
(This used to be commit d082a3c5f5785e9d7775d94542ce9cc8ef098f63)
-rw-r--r--source4/lib/replace/snprintf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/replace/snprintf.c b/source4/lib/replace/snprintf.c
index 5416a9d3e2..c06e8d76a3 100644
--- a/source4/lib/replace/snprintf.c
+++ b/source4/lib/replace/snprintf.c
@@ -224,7 +224,7 @@ struct pr_chunk_x {
int num;
};
-static size_t dopr(char *buffer, size_t maxlen, const char *format,
+static int dopr(char *buffer, size_t maxlen, const char *format,
va_list args_in);
static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
char *value, int flags, int min, int max);
@@ -237,7 +237,7 @@ static struct pr_chunk *new_chunk(void);
static int add_cnk_list_entry(struct pr_chunk_x **list,
int max_num, struct pr_chunk *chunk);
-static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
+static int dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
{
char ch;
int state;
@@ -251,7 +251,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
struct pr_chunk *cnk = NULL;
struct pr_chunk_x *clist = NULL;
int max_pos;
- size_t ret = -1;
+ int ret = -1;
VA_COPY(args, args_in);