strbuf: add strbuf_vaddf
In a variable-args function, the code for writing into a strbuf is non-trivial. We ended up cutting and pasting it in several places because there was no vprintf-style function for strbufs (which in turn was held up by a lack of va_copy). Now that we have a fallback va_copy, we can add strbuf_vaddf, the strbuf equivalent of vsprintf. And we can clean up the cut and paste mess. Signed-off-by: Jeff King <peff@peff.net> Improved-by: Christian Couder <christian.couder@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Feb 25, 2011 at 23:08 UTC
ebeb60900fbab569ed14f710a0a1abb1637ec792
5 files changed
+25
-63
fsck.c
+1
-13
@@ -347,26 +347,14 @@ int fsck_object(struct object *obj, int strict, fsck_error error_func)
347
int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
348
{
349
va_list ap;
350
- int len;
350
struct strbuf sb = STRBUF_INIT;
351
352
strbuf_addf(&sb, "object %s:", obj->sha1?sha1_to_hex(obj->sha1):"(null)");
353
354
va_start(ap, fmt);
356
- len = vsnprintf(sb.buf + sb.len, strbuf_avail(&sb), fmt, ap);
355
+ strbuf_vaddf(&sb, fmt, ap);
356
va_end(ap);
357
359
- if (len < 0)
360
- len = 0;
361
- if (len >= strbuf_avail(&sb)) {
362
- strbuf_grow(&sb, len + 2);
363
- va_start(ap, fmt);
364
- len = vsnprintf(sb.buf + sb.len, strbuf_avail(&sb), fmt, ap);
365
- va_end(ap);
366
- if (len >= strbuf_avail(&sb))
367
- die("this should not happen, your snprintf is broken");
368
- }
369
-
358
error("%s", sb.buf);
359
strbuf_release(&sb);
360
return 1;
merge-recursive.c
+1
-14
@@ -137,7 +137,6 @@ static void flush_output(struct merge_options *o)
137
__attribute__((format (printf, 3, 4)))
138
static void output(struct merge_options *o, int v, const char *fmt, ...)
139
{
140
- int len;
140
va_list ap;
141
142
if (!show(o, v))
@@ -148,21 +147,9 @@ static void output(struct merge_options *o, int v, const char *fmt, ...)
147
strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
148
149
va_start(ap, fmt);
151
- len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
150
+ strbuf_vaddf(&o->obuf, fmt, ap);
151
va_end(ap);
152
154
- if (len < 0)
155
- len = 0;
156
- if (len >= strbuf_avail(&o->obuf)) {
157
- strbuf_grow(&o->obuf, len + 2);
158
- va_start(ap, fmt);
159
- len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
160
- va_end(ap);
161
- if (len >= strbuf_avail(&o->obuf)) {
162
- die("this should not happen, your snprintf is broken");
163
- }
164
- }
165
- strbuf_setlen(&o->obuf, o->obuf.len + len);
153
strbuf_add(&o->obuf, "\n", 1);
154
if (!o->buffer_output)
155
flush_output(o);
strbuf.c
+15
-10
@@ -195,24 +195,29 @@ void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len)
195
196
void strbuf_addf(struct strbuf *sb, const char *fmt, ...)
197
{
198
- int len;
198
va_list ap;
199
+ va_start(ap, fmt);
200
+ strbuf_vaddf(sb, fmt, ap);
201
+ va_end(ap);
202
+}
203
+
204
+void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap)
205
+{
206
+ int len;
207
+ va_list cp;
208
209
if (!strbuf_avail(sb))
210
strbuf_grow(sb, 64);
203
- va_start(ap, fmt);
204
- len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
205
- va_end(ap);
211
+ va_copy(cp, ap);
212
+ len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, cp);
213
+ va_end(cp);
214
if (len < 0)
207
- die("your vsnprintf is broken");
215
+ die("BUG: your vsnprintf is broken (returned %d)", len);
216
if (len > strbuf_avail(sb)) {
217
strbuf_grow(sb, len);
210
- va_start(ap, fmt);
218
len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap);
212
- va_end(ap);
213
- if (len > strbuf_avail(sb)) {
214
- die("this should not happen, your snprintf is broken");
215
- }
219
+ if (len > strbuf_avail(sb))
220
+ die("BUG: your vsnprintf is broken (insatiable)");
221
}
222
strbuf_setlen(sb, sb->len + len);
223
}
strbuf.h
+2
@@ -120,6 +120,8 @@ extern void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *
120
121
__attribute__((format (printf,2,3)))
122
extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
123
+__attribute__((format (printf,2,0)))
124
+extern void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap);
125
126
extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);
127
/* XXX: if read fails, any partial read is undone */
trace.c
+6
-26
@@ -64,28 +64,18 @@ static const char err_msg[] = "Could not trace into fd given by "
64
65
void trace_printf(const char *fmt, ...)
66
{
67
- struct strbuf buf;
67
+ struct strbuf buf = STRBUF_INIT;
68
va_list ap;
69
- int fd, len, need_close = 0;
69
+ int fd, need_close = 0;
70
71
fd = get_trace_fd(&need_close);
72
if (!fd)
73
return;
74
75
set_try_to_free_routine(NULL); /* is never reset */
76
- strbuf_init(&buf, 64);
76
va_start(ap, fmt);
78
- len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
77
+ strbuf_vaddf(&buf, fmt, ap);
78
va_end(ap);
80
- if (len >= strbuf_avail(&buf)) {
81
- strbuf_grow(&buf, len - strbuf_avail(&buf) + 128);
82
- va_start(ap, fmt);
83
- len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
84
- va_end(ap);
85
- if (len >= strbuf_avail(&buf))
86
- die("broken vsnprintf");
87
- }
88
- strbuf_setlen(&buf, len);
79
80
write_or_whine_pipe(fd, buf.buf, buf.len, err_msg);
81
strbuf_release(&buf);
@@ -96,28 +86,18 @@ void trace_printf(const char *fmt, ...)
86
87
void trace_argv_printf(const char **argv, const char *fmt, ...)
88
{
99
- struct strbuf buf;
89
+ struct strbuf buf = STRBUF_INIT;
90
va_list ap;
101
- int fd, len, need_close = 0;
91
+ int fd, need_close = 0;
92
93
fd = get_trace_fd(&need_close);
94
if (!fd)
95
return;
96
97
set_try_to_free_routine(NULL); /* is never reset */
108
- strbuf_init(&buf, 64);
98
va_start(ap, fmt);
110
- len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
99
+ strbuf_vaddf(&buf, fmt, ap);
100
va_end(ap);
112
- if (len >= strbuf_avail(&buf)) {
113
- strbuf_grow(&buf, len - strbuf_avail(&buf) + 128);
114
- va_start(ap, fmt);
115
- len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
116
- va_end(ap);
117
- if (len >= strbuf_avail(&buf))
118
- die("broken vsnprintf");
119
- }
120
- strbuf_setlen(&buf, len);
101
102
sq_quote_argv(&buf, argv, 0);
103
strbuf_addch(&buf, '\n');