aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-12-21 22:18:16 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-12-21 22:18:16 +0000
commitee87ebf3815d37cbdcaf766a06ed40d4ca0dfe81 (patch)
treee65c2e36f20bd2a1134fc12269b5167cbf5c6782
parent26b6fba9d33bb4ce117db4ad22a94f05d04ff8be (diff)
downloadbusybox-w32-ee87ebf3815d37cbdcaf766a06ed40d4ca0dfe81.tar.gz
busybox-w32-ee87ebf3815d37cbdcaf766a06ed40d4ca0dfe81.tar.bz2
busybox-w32-ee87ebf3815d37cbdcaf766a06ed40d4ca0dfe81.zip
fix buglets found by randomconfig
-rw-r--r--shell/ash.c2
-rw-r--r--util-linux/mdev.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index f7604cf93..a5b19c863 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12900,7 +12900,9 @@ int ash_main(int argc, char **argv)
12900 INIT_G_misc(); 12900 INIT_G_misc();
12901 INIT_G_memstack(); 12901 INIT_G_memstack();
12902 INIT_G_var(); 12902 INIT_G_var();
12903#if ENABLE_ASH_ALIAS
12903 INIT_G_alias(); 12904 INIT_G_alias();
12905#endif
12904 INIT_G_cmdtable(); 12906 INIT_G_cmdtable();
12905 12907
12906#if PROFILE 12908#if PROFILE
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 927adf66f..84d5e1c0e 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -52,7 +52,7 @@ static void make_device(char *path, int delete)
52 if (ENABLE_FEATURE_MDEV_CONF) { 52 if (ENABLE_FEATURE_MDEV_CONF) {
53 FILE *fp; 53 FILE *fp;
54 char *line, *vline; 54 char *line, *vline;
55 size_t lineno = 0; 55 unsigned lineno = 0;
56 56
57 /* If we have a config file, look up the user settings */ 57 /* If we have a config file, look up the user settings */
58 fp = fopen_or_warn("/etc/mdev.conf", "r"); 58 fp = fopen_or_warn("/etc/mdev.conf", "r");
@@ -149,7 +149,7 @@ static void make_device(char *path, int delete)
149 149
150 /* Did everything parse happily? */ 150 /* Did everything parse happily? */
151 if (field <= 2) 151 if (field <= 2)
152 bb_error_msg_and_die("bad line %i", lineno); 152 bb_error_msg_and_die("bad line %u", lineno);
153 153
154 next_line: 154 next_line:
155 free(line); 155 free(line);