aboutsummaryrefslogtreecommitdiff
path: root/modutils/modprobe-small.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-08-04 13:20:36 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-08-04 13:20:36 +0000
commit27842288b393e532e5693f2a2bab94fee73a326d (patch)
tree98535c0fd140c89aa6b83179b11d160e6ed59c28 /modutils/modprobe-small.c
parent2b576b8e76ee0dc548f46489e2546b7ed70d080d (diff)
downloadbusybox-w32-27842288b393e532e5693f2a2bab94fee73a326d.tar.gz
busybox-w32-27842288b393e532e5693f2a2bab94fee73a326d.tar.bz2
busybox-w32-27842288b393e532e5693f2a2bab94fee73a326d.zip
libbb: make xrealloc_vector zero out the realloc'ed tail
function old new delta xrealloc_vector_helper 51 76 +25 man_main 712 705 -7 act 250 234 -16 create_list 91 70 -21 getopt_main 695 664 -31 load_dep_bb 281 248 -33 fileAction 744 709 -35 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/6 up/down: 25/-143) Total: -118 bytes
Diffstat (limited to 'modutils/modprobe-small.c')
-rw-r--r--modutils/modprobe-small.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 63be9aadb..4aa2b5862 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -270,10 +270,9 @@ static FAST_FUNC int fileAction(const char *pathname,
270 270
271 cur = module_count++; 271 cur = module_count++;
272 modinfo = xrealloc_vector(modinfo, 12, cur); 272 modinfo = xrealloc_vector(modinfo, 12, cur);
273//TODO: use zeroing version of xrealloc_vector?
274 modinfo[cur].pathname = xstrdup(pathname); 273 modinfo[cur].pathname = xstrdup(pathname);
275 modinfo[cur].aliases = NULL; 274 /*modinfo[cur].aliases = NULL; - xrealloc_vector did it */
276 modinfo[cur+1].pathname = NULL; 275 /*modinfo[cur+1].pathname = NULL;*/
277 276
278 if (!pathname_matches_modname(fname, modname_to_match)) { 277 if (!pathname_matches_modname(fname, modname_to_match)) {
279 dbg1_error_msg("'%s' module name doesn't match", pathname); 278 dbg1_error_msg("'%s' module name doesn't match", pathname);
@@ -330,8 +329,7 @@ static int load_dep_bb(void)
330 space = strchrnul(line, ' '); 329 space = strchrnul(line, ' ');
331 cur = module_count++; 330 cur = module_count++;
332 modinfo = xrealloc_vector(modinfo, 12, cur); 331 modinfo = xrealloc_vector(modinfo, 12, cur);
333//TODO: use zeroing version of xrealloc_vector? 332 /*modinfo[cur+1].pathname = NULL; - xrealloc_vector did it */
334 modinfo[cur+1].pathname = NULL;
335 modinfo[cur].pathname = line; /* we take ownership of malloced block here */ 333 modinfo[cur].pathname = line; /* we take ownership of malloced block here */
336 if (*space) 334 if (*space)
337 *space++ = '\0'; 335 *space++ = '\0';