diff options
| author | Michael Adam <obnox@samba.org> | 2011-11-25 16:36:40 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-11-26 00:34:54 +0100 |
| commit | 2c0abf2dcf040e6e32612e65f04ff488745612ae (patch) | |
| tree | d2c86b044dd2727e469f65e66bca49fe958d6b66 /ctdb/lib/replace/snprintf.c | |
| parent | 5d94dff27e96e09e1f81d4811ce1e2492edff13f (diff) | |
| download | samba-2c0abf2dcf040e6e32612e65f04ff488745612ae.tar.gz samba-2c0abf2dcf040e6e32612e65f04ff488745612ae.tar.xz samba-2c0abf2dcf040e6e32612e65f04ff488745612ae.zip | |
update lib/replace to current upstream version (samba master)
(This used to be ctdb commit 17bcffab19fdbb435b4745ff90c327342bbbf0f8)
Diffstat (limited to 'ctdb/lib/replace/snprintf.c')
| -rw-r--r-- | ctdb/lib/replace/snprintf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ctdb/lib/replace/snprintf.c b/ctdb/lib/replace/snprintf.c index 9f8a7657e5..bca774263e 100644 --- a/ctdb/lib/replace/snprintf.c +++ b/ctdb/lib/replace/snprintf.c @@ -504,6 +504,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args_in break; case 'p': cnk->type = CNK_PTR; + cnk->flags |= DP_F_UNSIGNED; break; case 'n': cnk->type = CNK_NUM; @@ -526,7 +527,7 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args_in } } - /* retieve the format arguments */ + /* retrieve the format arguments */ for (pnum = 0; pnum < max_pos; pnum++) { int i; @@ -1264,7 +1265,7 @@ static int add_cnk_list_entry(struct pr_chunk_x **list, VA_COPY(ap2, ap); ret = vsnprintf(NULL, 0, format, ap2); va_end(ap2); - if (ret <= 0) return ret; + if (ret < 0) return ret; (*ptr) = (char *)malloc(ret+1); if (!*ptr) return -1; |