emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No real need for my_query_module() and this eliminates some type-punned

Browse Source 
pointer warning on certain gcc versions (and saves 38 bytes).
This commit is contained in:
Rob Landley
2006-08-28 19:40:08 +00:00
parent 82ac9ecfe5
commit abfe107f78
5 changed files with 37 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modutils/lsmod.c
View File

@@ -15,7 +15,7 @@
#ifndef CONFIG_FEATURE_CHECK_TAINTED_MODULE
static inline void check_tainted(void) { printf("\n"); }
static void check_tainted(void) { printf("\n"); }
#else
#define TAINT_FILENAME "/proc/sys/kernel/tainted"
#define TAINT_PROPRIETORY_MODULE (1<<0)
@@ -80,13 +80,15 @@ int lsmod_main(int argc, char **argv)
char *module_names, *mn, *deps, *dn;
size_t bufsize, depsize, nmod, count, i, j;
module_names = xmalloc(bufsize = 256);
if (my_query_module(NULL, QM_MODULES, &module_names, &bufsize, &nmod)) {
bb_perror_msg_and_die("QM_MODULES");
module_names = deps = NULL;
bufsize = depsize = 0;
while(query_module(NULL, QM_MODULES, module_names, bufsize, &nmod)) {
if (errno != ENOSPC) bb_perror_msg_and_die("QM_MODULES");
module_names = xmalloc(bufsize = nmod);
}
deps = xmalloc(depsize = 256);
printf("Module Size Used by");
printf("Module\t\t\tSize Used by");
check_tainted();
for (i = 0, mn = module_names; i < nmod; mn += strlen(mn) + 1, i++) {
@@ -98,12 +100,13 @@ int lsmod_main(int argc, char **argv)
/* else choke */
bb_perror_msg_and_die("module %s: QM_INFO", mn);
}
if (my_query_module(mn, QM_REFS, &deps, &depsize, &count)) {
while (query_module(mn, QM_REFS, deps, depsize, &count)) {
if (errno == ENOENT) {
/* The module was removed out from underneath us. */
continue;
}
bb_perror_msg_and_die("module %s: QM_REFS", mn);
} else if (errno != ENOSPC)
bb_perror_msg_and_die("module %s: QM_REFS", mn);
deps = xrealloc(deps, count);
}
printf("%-20s%8lu%4ld", mn, info.size, info.usecount);
if (info.flags & NEW_MOD_DELETED)