diff options
| author | Haibo Huang <hhb@google.com> | 2019-01-08 14:27:10 -0800 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-01-14 23:02:29 +0000 |
| commit | 21926d584a5b118cbff81a9fb4329059011f87c6 (patch) | |
| tree | 421b037a92a6d5209e8e4c30e8a830c262abe6d4 /tests/server/util.c | |
| parent | 98caa6f514b401764e3ac76041ff7e006f109e8c (diff) | |
| download | external_curl-21926d584a5b118cbff81a9fb4329059011f87c6.tar.gz external_curl-21926d584a5b118cbff81a9fb4329059011f87c6.tar.bz2 external_curl-21926d584a5b118cbff81a9fb4329059011f87c6.zip | |
Upgrade curl from 7.62.0 to 7.63.0
Test: build, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Iecd6120501e7a6d2c8b83c2891de62163a30f08a
Diffstat (limited to 'tests/server/util.c')
| -rw-r--r-- | tests/server/util.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/server/util.c b/tests/server/util.c index 07ef63ee..df1e35da 100644 --- a/tests/server/util.c +++ b/tests/server/util.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, 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 @@ -87,7 +87,7 @@ char *data_to_hex(char *data, size_t len) if((data[i] >= 0x20) && (data[i] < 0x7f)) *optr++ = *iptr++; else { - snprintf(optr, 4, "%%%02x", *iptr++); + msnprintf(optr, 4, "%%%02x", *iptr++); optr += 3; } } @@ -121,11 +121,12 @@ void logmsg(const char *msg, ...) sec = epoch_offset + tv.tv_sec; now = localtime(&sec); /* not thread safe but we don't care */ - snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld", - (int)now->tm_hour, (int)now->tm_min, (int)now->tm_sec, (long)tv.tv_usec); + msnprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld", + (int)now->tm_hour, (int)now->tm_min, (int)now->tm_sec, + (long)tv.tv_usec); va_start(ap, msg); - vsnprintf(buffer, sizeof(buffer), msg, ap); + mvsnprintf(buffer, sizeof(buffer), msg, ap); va_end(ap); logfp = fopen(serverlogfile, "ab"); @@ -151,7 +152,7 @@ void win32_perror(const char *msg) if(!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, LANG_NEUTRAL, buf, sizeof(buf), NULL)) - snprintf(buf, sizeof(buf), "Unknown error %lu (%#lx)", err, err); + msnprintf(buf, sizeof(buf), "Unknown error %lu (%#lx)", err, err); if(msg) fprintf(stderr, "%s: ", msg); fprintf(stderr, "%s\n", buf); @@ -195,7 +196,7 @@ const char *path = "."; char *test2file(long testno) { static char filename[256]; - snprintf(filename, sizeof(filename), TEST_DATA_PATH, path, testno); + msnprintf(filename, sizeof(filename), TEST_DATA_PATH, path, testno); return filename; } |