aboutsummaryrefslogtreecommitdiff
path: root/lib/sendf.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-12-06 23:04:30 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-12-06 23:04:30 +0000
commit4435e3b269606107f90adb3e1b842e439029b6b3 (patch)
tree379b4c883f7edf26e25dce0795060ae9a8124b0a /lib/sendf.c
parentb96a0dba90780950ed7db4882349d99981714216 (diff)
Fixed so that the final error message is sent to the verbose info "stream"
even if no errorbuffer is set.
Diffstat (limited to 'lib/sendf.c')
-rw-r--r--lib/sendf.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/lib/sendf.c b/lib/sendf.c
index 53a0a4e6a..175323903 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -158,21 +158,20 @@ void Curl_failf(struct SessionHandle *data, const char *fmt, ...)
if(data->set.errorbuffer && !data->state.errorbuf) {
vsnprintf(data->set.errorbuffer, CURL_ERROR_SIZE, fmt, ap);
data->state.errorbuf = TRUE; /* wrote error string */
+ }
+ if(data->set.verbose) {
+ size_t len;
+
+ vsnprintf(data->state.buffer, BUFSIZE, fmt, ap);
+ len = strlen(data->state.buffer);
- if(data->set.verbose) {
- size_t len = strlen(data->set.errorbuffer);
- bool doneit=FALSE;
- if(len < CURL_ERROR_SIZE - 1) {
- doneit = TRUE;
- data->set.errorbuffer[len] = '\n';
- data->set.errorbuffer[++len] = '\0';
+ if(len < BUFSIZE - 1) {
+ data->state.buffer[len] = '\n';
+ data->state.buffer[++len] = '\0';
}
- Curl_debug(data, CURLINFO_TEXT, data->set.errorbuffer, len, NULL);
- if(doneit)
- /* cut off the newline again */
- data->set.errorbuffer[--len]=0;
- }
+ Curl_debug(data, CURLINFO_TEXT, data->state.buffer, len, NULL);
}
+
va_end(ap);
}