1 files changed, 12 insertions, 12 deletions
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 43e4b8c4d..3b45d70b4 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -99,12 +99,12 @@ int makedevs_main(int argc, char **argv)
        while ((line = xmalloc_fgetline(table)) != NULL) {
                char type;
-                unsigned int mode = 0755;
+                unsigned mode = 0755;
-                unsigned int major = 0;
+                unsigned major = 0;
-                unsigned int minor = 0;
+                unsigned minor = 0;
-                unsigned int count = 0;
+                unsigned count = 0;
-                unsigned int increment = 0;
+                unsigned increment = 0;
-                unsigned int start = 0;
+                unsigned start = 0;
                char name[41];
                char user[41];
                char group[41];
@@ -121,7 +121,7 @@ int makedevs_main(int argc, char **argv)
                {
                        if (*line=='\0' || *line=='#' || isspace(*line))
                                continue;
-                        bb_error_msg("line %d invalid: '%s'", linenum, line);
+                        bb_error_msg("invalid line %d: '%s'", linenum, line);
                        ret = EXIT_FAILURE;
                        continue;
                }
@@ -140,7 +140,7 @@ int makedevs_main(int argc, char **argv)
                                ret = EXIT_FAILURE;
                                goto loop;
                        }
-                        if ((mode != -1) && (chmod(full_name, mode) < 0)){
+                        if (chmod(full_name, mode) < 0) {
                                bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
                                ret = EXIT_FAILURE;
                                goto loop;
@@ -157,7 +157,7 @@ int makedevs_main(int argc, char **argv)
                                ret = EXIT_FAILURE;
                                goto loop;
                        }
-                        if ((mode != -1) && (chmod(full_name, mode) < 0)){
+                        if (chmod(full_name, mode) < 0) {
                                bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
                                ret = EXIT_FAILURE;
                                goto loop;
@@ -180,7 +180,7 @@ int makedevs_main(int argc, char **argv)
                        }
                        if (count > 0) {
-                                int i;
+                                unsigned i;
                                char *full_name_inc;
                                full_name_inc = xmalloc(strlen(full_name) + 4);
@@ -195,7 +195,7 @@ int makedevs_main(int argc, char **argv)
                                                bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc);
                                                ret = EXIT_FAILURE;
                                        }
-                                        if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){
+                                        if (chmod(full_name_inc, mode) < 0) {
                                                bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc);
                                                ret = EXIT_FAILURE;
                                        }
@@ -211,7 +211,7 @@ int makedevs_main(int argc, char **argv)
                                        bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
                                        ret = EXIT_FAILURE;
                                }
-                                if ((mode != -1) && (chmod(full_name, mode) < 0)){
+                                if (chmod(full_name, mode) < 0) {
                                        bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
                                        ret = EXIT_FAILURE;
                                }

diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index 43e4b8c4d..3b45d70b4 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c
@@ -99,12 +99,12 @@ int makedevs_main(int argc, char **argv)
99		99
100	while ((line = xmalloc_fgetline(table)) != NULL) {	100	while ((line = xmalloc_fgetline(table)) != NULL) {
101	char type;	101	char type;
102	unsigned int mode = 0755;	102	unsigned mode = 0755;
103	unsigned int major = 0;	103	unsigned major = 0;
104	unsigned int minor = 0;	104	unsigned minor = 0;
105	unsigned int count = 0;	105	unsigned count = 0;
106	unsigned int increment = 0;	106	unsigned increment = 0;
107	unsigned int start = 0;	107	unsigned start = 0;
108	char name[41];	108	char name[41];
109	char user[41];	109	char user[41];
110	char group[41];	110	char group[41];
@@ -121,7 +121,7 @@ int makedevs_main(int argc, char **argv)
121	{	121	{
122	if (line=='\0' \|\| line=='#' \|\| isspace(*line))	122	if (line=='\0' \|\| line=='#' \|\| isspace(*line))
123	continue;	123	continue;
124	bb_error_msg("line %d invalid: '%s'", linenum, line);	124	bb_error_msg("invalid line %d: '%s'", linenum, line);
125	ret = EXIT_FAILURE;	125	ret = EXIT_FAILURE;
126	continue;	126	continue;
127	}	127	}
@@ -140,7 +140,7 @@ int makedevs_main(int argc, char **argv)
140	ret = EXIT_FAILURE;	140	ret = EXIT_FAILURE;
141	goto loop;	141	goto loop;
142	}	142	}
143	if ((mode != -1) && (chmod(full_name, mode) < 0)){	143	if (chmod(full_name, mode) < 0) {
144	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);	144	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
145	ret = EXIT_FAILURE;	145	ret = EXIT_FAILURE;
146	goto loop;	146	goto loop;
@@ -157,7 +157,7 @@ int makedevs_main(int argc, char **argv)
157	ret = EXIT_FAILURE;	157	ret = EXIT_FAILURE;
158	goto loop;	158	goto loop;
159	}	159	}
160	if ((mode != -1) && (chmod(full_name, mode) < 0)){	160	if (chmod(full_name, mode) < 0) {
161	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);	161	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
162	ret = EXIT_FAILURE;	162	ret = EXIT_FAILURE;
163	goto loop;	163	goto loop;
@@ -180,7 +180,7 @@ int makedevs_main(int argc, char **argv)
180	}	180	}
181		181
182	if (count > 0) {	182	if (count > 0) {
183	int i;	183	unsigned i;
184	char *full_name_inc;	184	char *full_name_inc;
185		185
186	full_name_inc = xmalloc(strlen(full_name) + 4);	186	full_name_inc = xmalloc(strlen(full_name) + 4);
@@ -195,7 +195,7 @@ int makedevs_main(int argc, char **argv)
195	bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc);	195	bb_perror_msg("line %d: chown failed for %s", linenum, full_name_inc);
196	ret = EXIT_FAILURE;	196	ret = EXIT_FAILURE;
197	}	197	}
198	if ((mode != -1) && (chmod(full_name_inc, mode) < 0)){	198	if (chmod(full_name_inc, mode) < 0) {
199	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc);	199	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name_inc);
200	ret = EXIT_FAILURE;	200	ret = EXIT_FAILURE;
201	}	201	}
@@ -211,7 +211,7 @@ int makedevs_main(int argc, char **argv)
211	bb_perror_msg("line %d: chown failed for %s", linenum, full_name);	211	bb_perror_msg("line %d: chown failed for %s", linenum, full_name);
212	ret = EXIT_FAILURE;	212	ret = EXIT_FAILURE;
213	}	213	}
214	if ((mode != -1) && (chmod(full_name, mode) < 0)){	214	if (chmod(full_name, mode) < 0) {
215	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);	215	bb_perror_msg("line %d: chmod failed for %s", linenum, full_name);
216	ret = EXIT_FAILURE;	216	ret = EXIT_FAILURE;
217	}	217	}