projects
/
platform
/
upstream
/
curl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Update to 7.44.0"
[platform/upstream/curl.git]
/
src
/
tool_msgs.c
diff --git
a/src/tool_msgs.c
b/src/tool_msgs.c
index
38de977
..
3311b55
100644
(file)
--- a/
src/tool_msgs.c
+++ b/
src/tool_msgs.c
@@
-5,7
+5,7
@@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 201
5
, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 201
4
, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@
-38,9
+38,9
@@
* mute (--silent) was selected.
*/
* mute (--silent) was selected.
*/
-void warnf(struct
Global
Config *config, const char *fmt, ...)
+void warnf(struct
Operation
Config *config, const char *fmt, ...)
{
{
- if(!config->mute) {
+ if(!config->
global->
mute) {
va_list ap;
int len;
char *ptr;
va_list ap;
int len;
char *ptr;
@@
-52,7
+52,7
@@
void warnf(struct GlobalConfig *config, const char *fmt, ...)
ptr = print_buffer;
while(len > 0) {
ptr = print_buffer;
while(len > 0) {
- fputs(WARN_PREFIX, config->errors);
+ fputs(WARN_PREFIX, config->
global->
errors);
if(len > (int)WARN_TEXTWIDTH) {
int cut = WARN_TEXTWIDTH-1;
if(len > (int)WARN_TEXTWIDTH) {
int cut = WARN_TEXTWIDTH-1;
@@
-65,13
+65,13
@@
void warnf(struct GlobalConfig *config, const char *fmt, ...)
max text width then! */
cut = WARN_TEXTWIDTH-1;
max text width then! */
cut = WARN_TEXTWIDTH-1;
- (void)fwrite(ptr, cut + 1, 1, config->errors);
- fputs("\n", config->errors);
+ (void)fwrite(ptr, cut + 1, 1, config->
global->
errors);
+ fputs("\n", config->
global->
errors);
ptr += cut+1; /* skip the space too */
len -= cut;
}
else {
ptr += cut+1; /* skip the space too */
len -= cut;
}
else {
- fputs(ptr, config->errors);
+ fputs(ptr, config->
global->
errors);
len = 0;
}
}
len = 0;
}
}