aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c11
-rw-r--r--modutils/lsmod.c2
-rw-r--r--modutils/rmmod.c6
3 files changed, 9 insertions, 10 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index f6ab44309..dd999a672 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -3632,9 +3632,9 @@ static int obj_gpl_license(struct obj_file *f, const char **license)
3632 *license = value+1; 3632 *license = value+1;
3633 for (i = 0; i < sizeof(gpl_licenses)/sizeof(gpl_licenses[0]); ++i) { 3633 for (i = 0; i < sizeof(gpl_licenses)/sizeof(gpl_licenses[0]); ++i) {
3634 if (strcmp(value+1, gpl_licenses[i]) == 0) 3634 if (strcmp(value+1, gpl_licenses[i]) == 0)
3635 return(0); 3635 return 0;
3636 } 3636 }
3637 return(2); 3637 return 2;
3638 } 3638 }
3639 if (strchr(ptr, '\0')) 3639 if (strchr(ptr, '\0'))
3640 ptr = strchr(ptr, '\0') + 1; 3640 ptr = strchr(ptr, '\0') + 1;
@@ -3642,7 +3642,7 @@ static int obj_gpl_license(struct obj_file *f, const char **license)
3642 ptr = endptr; 3642 ptr = endptr;
3643 } 3643 }
3644 } 3644 }
3645 return(1); 3645 return 1;
3646} 3646}
3647 3647
3648#define TAINT_FILENAME "/proc/sys/kernel/tainted" 3648#define TAINT_FILENAME "/proc/sys/kernel/tainted"
@@ -4227,12 +4227,11 @@ out:
4227 if(fp) 4227 if(fp)
4228 fclose(fp); 4228 fclose(fp);
4229 free(tmp1); 4229 free(tmp1);
4230 if(!tmp1) { 4230 if(!tmp1)
4231 free(m_name); 4231 free(m_name);
4232 }
4233 free(m_filename); 4232 free(m_filename);
4234#endif 4233#endif
4235 return(exit_status); 4234 return exit_status;
4236} 4235}
4237 4236
4238 4237
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index f462aafc3..ffde3d829 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -134,7 +134,7 @@ int lsmod_main(int argc, char **argv)
134 free(module_names); 134 free(module_names);
135#endif 135#endif
136 136
137 return( 0); 137 return 0;
138} 138}
139 139
140#else /* CONFIG_FEATURE_QUERY_MODULE_INTERFACE */ 140#else /* CONFIG_FEATURE_QUERY_MODULE_INTERFACE */
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index ce239a21f..22e864d57 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -57,8 +57,8 @@ int rmmod_main(int argc, char **argv)
57 57
58 while (nmod != pnmod) { 58 while (nmod != pnmod) {
59 if (syscall(__NR_delete_module, NULL, flags) != 0) { 59 if (syscall(__NR_delete_module, NULL, flags) != 0) {
60 if (errno==EFAULT) 60 if (errno == EFAULT)
61 return(ret); 61 return ret;
62 bb_perror_msg_and_die("rmmod"); 62 bb_perror_msg_and_die("rmmod");
63 } 63 }
64 pnmod = nmod; 64 pnmod = nmod;
@@ -92,5 +92,5 @@ int rmmod_main(int argc, char **argv)
92 } 92 }
93 } 93 }
94 94
95 return(ret); 95 return ret;
96} 96}