summaryrefslogtreecommitdiff
path: root/modutils/modprobe-small.c
diff options
context:
space:
mode:
authorDenys Vlasenko2009-09-06 02:36:23 +0200
committerDenys Vlasenko2009-09-06 02:36:23 +0200
commit90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3 (patch)
tree46fabe3a471368b0bcee393123539775346d3410 /modutils/modprobe-small.c
parent1f7c167b23dfd5b03f386a657cb95867e1605e1b (diff)
downloadbusybox-90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3.zip
busybox-90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3.tar.gz
remove some GNUisms. by Dan Fandrich (dan AT coneharvesters.com)
function old new delta logdirs_reopen 1310 1308 -2 read_line_input 4757 4753 -4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-6) Total: -6 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils/modprobe-small.c')
-rw-r--r--modutils/modprobe-small.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 0d78033..bbd700e 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -314,6 +314,7 @@ static int load_dep_bb(void)
while ((line = xmalloc_fgetline(fp)) != NULL) {
char* space;
+ char* linebuf;
int cur;
if (!line[0]) {
@@ -328,7 +329,8 @@ static int load_dep_bb(void)
if (*space)
*space++ = '\0';
modinfo[cur].aliases = space;
- modinfo[cur].deps = xmalloc_fgetline(fp) ? : xzalloc(1);
+ linebuf = xmalloc_fgetline(fp);
+ modinfo[cur].deps = linebuf ? linebuf : xzalloc(1);
if (modinfo[cur].deps[0]) {
/* deps are not "", so next line must be empty */
line = xmalloc_fgetline(fp);