summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-08-05 22:41:06 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-08-05 22:41:06 (GMT)
commit543efd7b4b4265ae507b4e3b048bf23a51a726fc (patch)
treeabd856fe3c73b8724f602d4b5e1f87bc1eb6e2c1
parentaadb485bd01ce22f04d22383efbe4f5f82bbab3c (diff)
downloadbusybox-543efd7b4b4265ae507b4e3b048bf23a51a726fc.tar.gz
busybox-543efd7b4b4265ae507b4e3b048bf23a51a726fc.tar.bz2
libbb: code shrink
function old new delta xmalloc_ttyname 46 42 -4 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/xfuncs_printf.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 05aa07c..a706832 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -541,13 +541,11 @@ int FAST_FUNC bb_xioctl(int fd, unsigned request, void *argp)
char* FAST_FUNC xmalloc_ttyname(int fd)
{
- char *buf = xzalloc(128);
- int r = ttyname_r(fd, buf, 127);
- if (r) {
- free(buf);
- buf = NULL;
- }
- return buf;
+ char buf[128];
+ int r = ttyname_r(fd, buf, sizeof(buf) - 1);
+ if (r)
+ return NULL;
+ return xstrdup(buf);
}
void FAST_FUNC generate_uuid(uint8_t *buf)