diff options
Diffstat (limited to 'src/tools/http_common.c')
-rw-r--r-- | src/tools/http_common.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/tools/http_common.c b/src/tools/http_common.c index df6f9a64..dfd0aa87 100644 --- a/src/tools/http_common.c +++ b/src/tools/http_common.c @@ -64,35 +64,31 @@ http_basename_from_url(const char* url) } void -http_print_transfer_update(ProfWin* window, char* url, - const char* fmt, ...) +http_print_transfer_update(ProfWin* window, char* url, const char* fmt, ...) { va_list args; va_start(args, fmt); - char* msg; - if (vasprintf(&msg, fmt, args) == -1) { - msg = strdup(FALLBACK_MSG); - } + GString* msg = g_string_new(FALLBACK_MSG); + g_string_vprintf(msg, fmt, args); va_end(args); - win_update_entry_message(window, url, msg); - free(msg); + win_update_entry_message(window, url, msg->str); + + g_string_free(msg, TRUE); } void -http_print_transfer(ProfWin* window, char* url, - const char* fmt, ...) +http_print_transfer(ProfWin* window, char* url, const char* fmt, ...) { va_list args; va_start(args, fmt); - char* msg; - if (vasprintf(&msg, fmt, args) == -1) { - msg = strdup(FALLBACK_MSG); - } + GString* msg = g_string_new(FALLBACK_MSG); + g_string_vprintf(msg, fmt, args); va_end(args); - win_print_http_transfer(window, msg, url); - free(msg); + win_print_http_transfer(window, msg->str, url); + + g_string_free(msg, TRUE); } |