From c715fa0b60c86449e09b313245de621b32e329d2 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 27 Feb 2015 20:48:38 +0000 Subject: tool: Updated the warnf() function to use the GlobalConfig structure As the 'error' and 'mute' options are now part of the GlobalConfig, rather than per Operation, updated the warnf() function to use this structure rather than the OperationConfig. --- src/tool_formparse.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/tool_formparse.c') diff --git a/src/tool_formparse.c b/src/tool_formparse.c index 1dcd897e6..8b3c39d27 100644 --- a/src/tool_formparse.c +++ b/src/tool_formparse.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -206,7 +206,7 @@ int formparse(struct OperationConfig *config, /* verify that this is a fine type specifier */ if(2 != sscanf(type, "%127[^/]/%127[^;,\n]", type_major, type_minor)) { - warnf(config, "Illegally formatted content-type field!\n"); + warnf(config->global, "Illegally formatted content-type field!\n"); Curl_safefree(contents); FreeMultiInfo(&multi_start, &multi_current); return 2; /* illegal content-type syntax! */ @@ -246,7 +246,7 @@ int formparse(struct OperationConfig *config, semicolon = (';' == *ptr) ? TRUE : FALSE; if(*unknown) { *word_end = '\0'; - warnf(config, "skip unknown form field: %s\n", unknown); + warnf(config->global, "skip unknown form field: %s\n", unknown); } } } @@ -257,7 +257,7 @@ int formparse(struct OperationConfig *config, if(*contp && !AddMultiFiles(contp, type, filename, &multi_start, &multi_current)) { - warnf(config, "Error building form post!\n"); + warnf(config->global, "Error building form post!\n"); Curl_safefree(contents); FreeMultiInfo(&multi_start, &multi_current); return 3; @@ -291,7 +291,7 @@ int formparse(struct OperationConfig *config, if(curl_formadd(httppost, last_post, CURLFORM_COPYNAME, name, CURLFORM_ARRAY, forms, CURLFORM_END) != 0) { - warnf(config, "curl_formadd failed!\n"); + warnf(config->global, "curl_formadd failed!\n"); Curl_safefree(forms); Curl_safefree(contents); return 5; @@ -323,8 +323,8 @@ int formparse(struct OperationConfig *config, if(curl_formadd(httppost, last_post, CURLFORM_ARRAY, info, CURLFORM_END ) != 0) { - warnf(config, "curl_formadd failed, possibly the file %s is bad!\n", - contp+1); + warnf(config->global, "curl_formadd failed, possibly the file %s is " + "bad!\n", contp + 1); Curl_safefree(contents); return 6; } @@ -332,7 +332,7 @@ int formparse(struct OperationConfig *config, else { #ifdef CURL_DOES_CONVERSIONS if(convert_to_network(contp, strlen(contp))) { - warnf(config, "curl_formadd failed!\n"); + warnf(config->global, "curl_formadd failed!\n"); Curl_safefree(contents); return 7; } @@ -343,7 +343,7 @@ int formparse(struct OperationConfig *config, info[i].option = CURLFORM_END; if(curl_formadd(httppost, last_post, CURLFORM_ARRAY, info, CURLFORM_END) != 0) { - warnf(config, "curl_formadd failed!\n"); + warnf(config->global, "curl_formadd failed!\n"); Curl_safefree(contents); return 8; } @@ -352,10 +352,9 @@ int formparse(struct OperationConfig *config, } else { - warnf(config, "Illegally formatted input field!\n"); + warnf(config->global, "Illegally formatted input field!\n"); return 1; } Curl_safefree(contents); return 0; } - -- cgit v1.2.3