diff options
| author | ache <ache@FreeBSD.org> | 1997-12-24 14:32:40 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1997-12-24 14:32:40 +0000 |
| commit | 1756dc5a157c466f928bcb69ed3d7c608c90cf91 (patch) | |
| tree | 718199723885916620fe3aa19c3daf962ffe1745 | |
| parent | b8a0fd9139fb9ad3f16b20315e576ff7df5eaa86 (diff) | |
| download | FreeBSD-src-1756dc5a157c466f928bcb69ed3d7c608c90cf91.zip FreeBSD-src-1756dc5a157c466f928bcb69ed3d7c608c90cf91.tar.gz | |
Back out part related to "return 0 if n == 0" and return EOF as before.
The main argument is that it is impossible to determine if %n evaluated or not
when snprintf return 0, because it can happens for both n == 0 and n == 1.
Although EOF here is good indication of the end of process, if n is
decreased in the loop...
Since it is already supposed in many places that EOF *is* negative, f.e.
from Single Unix specs for snprintf
"return ... a negative value if an output error was encountered"
this not makes situation worse.
| -rw-r--r-- | lib/libc/stdio/snprintf.c | 4 | ||||
| -rw-r--r-- | lib/libc/stdio/vsnprintf.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c index 086f8b2..8a7584c 100644 --- a/lib/libc/stdio/snprintf.c +++ b/lib/libc/stdio/snprintf.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id: snprintf.c,v 1.5 1997/02/22 15:02:29 peter Exp $"; + "$Id: snprintf.c,v 1.6 1997/12/24 12:31:31 ache Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> @@ -65,8 +65,6 @@ snprintf(str, n, fmt, va_alist) va_list ap; FILE f; - if (n == 0) - return (0); if ((int)n < 1) return (EOF); n--; diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c index ec13305..8d824fe 100644 --- a/lib/libc/stdio/vsnprintf.c +++ b/lib/libc/stdio/vsnprintf.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id: vsnprintf.c,v 1.5 1997/02/22 15:02:45 peter Exp $"; + "$Id: vsnprintf.c,v 1.6 1997/12/24 12:31:32 ache Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> @@ -54,8 +54,6 @@ vsnprintf(str, n, fmt, ap) int ret; FILE f; - if (n == 0) - return (0); if ((int)n < 1) return (EOF); n--; |
