diff options
author | André Goddard Rosa <andre.goddard@gmail.com> | 2010-01-30 22:39:00 -0200 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2010-04-29 07:31:44 -0700 |
commit | 6aed4288eba64f8265b98d34fdfd0bc0cd76151d (patch) | |
tree | 30ef6162d6d4364d27037798f69dd93eb7e35d53 /libc/stdio | |
parent | e734769276045c0cb89d4620fdd4ef35a0e6c335 (diff) | |
download | bionic-6aed4288eba64f8265b98d34fdfd0bc0cd76151d.zip bionic-6aed4288eba64f8265b98d34fdfd0bc0cd76151d.tar.gz bionic-6aed4288eba64f8265b98d34fdfd0bc0cd76151d.tar.bz2 |
stdio: simplify asprintf()
... by removing unneeded NULL check, as free() already does it.
By the way, we don't need to set a stack variable back to NULL.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Change-Id: Id1f72e872f73366dddcea4abc75885a3d9a318c6
Diffstat (limited to 'libc/stdio')
-rw-r--r-- | libc/stdio/asprintf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libc/stdio/asprintf.c b/libc/stdio/asprintf.c index 7379140..1257c7f 100644 --- a/libc/stdio/asprintf.c +++ b/libc/stdio/asprintf.c @@ -39,7 +39,7 @@ asprintf(char **str, const char *fmt, ...) f._bf._size = f._w = 127; /* Leave room for the NUL */ va_start(ap, fmt); ret = vfprintf(&f, fmt, ap); - va_end(ap); + va_end(ap); if (ret == -1) goto err; *f._p = '\0'; @@ -50,10 +50,7 @@ asprintf(char **str, const char *fmt, ...) return (ret); err: - if (f._bf._base) { - free(f._bf._base); - f._bf._base = NULL; - } + free(f._bf._base); *str = NULL; errno = ENOMEM; return (-1); |