diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-11-22 09:01:24 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-11-23 08:26:51 +0100 |
| commit | dcd6f810255785d52b89150e18460fb0899d4f7e (patch) | |
| tree | c3cb7cdcb79dbf752edcd997934e44a2e9998397 /lib/inet_ntop.c | |
| parent | 9944d6ba334f07b0b6199bdb5bb82091c88c16ed (diff) | |
| download | curl-dcd6f810255785d52b89150e18460fb0899d4f7e.tar.gz | |
snprintf: renamed and we now only use msnprintf()
The function does not return the same value as snprintf() normally does,
so readers may be mislead into thinking the code works differently than
it actually does. A different function name makes this easier to detect.
Reported-by: Tomas Hoger
Assisted-by: Daniel Gustafsson
Fixes #3296
Closes #3297
Diffstat (limited to 'lib/inet_ntop.c')
| -rw-r--r-- | lib/inet_ntop.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index ac5d2d4d6..855981c66 100644 --- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -55,11 +55,11 @@ static char *inet_ntop4 (const unsigned char *src, char *dst, size_t size) DEBUGASSERT(size >= 16); tmp[0] = '\0'; - (void)snprintf(tmp, sizeof(tmp), "%d.%d.%d.%d", - ((int)((unsigned char)src[0])) & 0xff, - ((int)((unsigned char)src[1])) & 0xff, - ((int)((unsigned char)src[2])) & 0xff, - ((int)((unsigned char)src[3])) & 0xff); + (void)msnprintf(tmp, sizeof(tmp), "%d.%d.%d.%d", + ((int)((unsigned char)src[0])) & 0xff, + ((int)((unsigned char)src[1])) & 0xff, + ((int)((unsigned char)src[2])) & 0xff, + ((int)((unsigned char)src[3])) & 0xff); len = strlen(tmp); if(len == 0 || len >= size) { @@ -148,7 +148,7 @@ static char *inet_ntop6 (const unsigned char *src, char *dst, size_t size) tp += strlen(tp); break; } - tp += snprintf(tp, 5, "%lx", words[i]); + tp += msnprintf(tp, 5, "%lx", words[i]); } /* Was it a trailing run of 0x00's? |