diff options
| author | das <das@FreeBSD.org> | 2009-02-28 06:06:57 +0000 |
|---|---|---|
| committer | das <das@FreeBSD.org> | 2009-02-28 06:06:57 +0000 |
| commit | e5de8b5d17e9fc17c5f215cb5052acfa2a94f96b (patch) | |
| tree | 7523c9dd08e5896a325226e1c1c23b88ff90a00d /lib/libc/stdio/vfprintf.c | |
| parent | ebb4763b7fa6c54ee27fcd944e1d83d892f43906 (diff) | |
| download | FreeBSD-src-e5de8b5d17e9fc17c5f215cb5052acfa2a94f96b.zip FreeBSD-src-e5de8b5d17e9fc17c5f215cb5052acfa2a94f96b.tar.gz | |
Replace a dozen lines of code with a call to strnlen() / wcsnlen().
Diffstat (limited to 'lib/libc/stdio/vfprintf.c')
| -rw-r--r-- | lib/libc/stdio/vfprintf.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 21e8f82..7e5d7fe 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -822,22 +822,7 @@ fp_common: } } else if ((cp = GETARG(char *)) == NULL) cp = "(null)"; - if (prec >= 0) { - /* - * can't use strlen; can only look for the - * NUL in the first `prec' characters, and - * strlen() will go further. - */ - char *p = memchr(cp, 0, (size_t)prec); - - if (p != NULL) { - size = p - cp; - if (size > prec) - size = prec; - } else - size = prec; - } else - size = strlen(cp); + size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp); sign = '\0'; break; case 'U': |
