diff options
author | Erik Andersen <andersen@codepoet.org> | 2000-01-29 07:06:24 +0000 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 2000-01-29 07:06:24 +0000 |
commit | 04e97024e78f452526f710a5b3969c78a65f2b33 (patch) | |
tree | d5eba84927f0426038db2a1ef3b8b241996fd420 | |
parent | a6d0dbc86fd8a84f9c2a05f77013bd3eb5efa697 (diff) | |
download | busybox-w32-04e97024e78f452526f710a5b3969c78a65f2b33.tar.gz busybox-w32-04e97024e78f452526f710a5b3969c78a65f2b33.tar.bz2 busybox-w32-04e97024e78f452526f710a5b3969c78a65f2b33.zip |
Clear up some ambiguity with old style assignments.
-Erik
-rw-r--r-- | chmod_chown_chgrp.c | 8 | ||||
-rw-r--r-- | coreutils/date.c | 4 | ||||
-rw-r--r-- | date.c | 4 | ||||
-rw-r--r-- | find.c | 6 | ||||
-rw-r--r-- | findutils/find.c | 6 | ||||
-rw-r--r-- | init.c | 4 | ||||
-rw-r--r-- | init/init.c | 4 | ||||
-rw-r--r-- | logger.c | 2 | ||||
-rw-r--r-- | mount.c | 4 | ||||
-rw-r--r-- | sysklogd/logger.c | 2 | ||||
-rw-r--r-- | util-linux/mount.c | 4 |
11 files changed, 24 insertions, 24 deletions
diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c index fb5cb921b..773f4b0c0 100644 --- a/chmod_chown_chgrp.c +++ b/chmod_chown_chgrp.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include "internal.h" | 27 | #include "internal.h" |
28 | 28 | ||
29 | 29 | ||
30 | static uid_t uid=-1; | 30 | static uid_t uid = -1; |
31 | static gid_t gid=-1; | 31 | static gid_t gid = -1; |
32 | static int whichApp; | 32 | static int whichApp; |
33 | static char* invocationName=NULL; | 33 | static char* invocationName=NULL; |
34 | static char* theMode=NULL; | 34 | static char* theMode=NULL; |
@@ -92,7 +92,7 @@ int chmod_chown_chgrp_main(int argc, char **argv) | |||
92 | 92 | ||
93 | if (argc < 2) | 93 | if (argc < 2) |
94 | usage( appUsage); | 94 | usage( appUsage); |
95 | invocationName=*argv; | 95 | invocationName = *argv; |
96 | argc--; | 96 | argc--; |
97 | argv++; | 97 | argv++; |
98 | 98 | ||
@@ -111,7 +111,7 @@ int chmod_chown_chgrp_main(int argc, char **argv) | |||
111 | } | 111 | } |
112 | 112 | ||
113 | if ( whichApp == CHMOD_APP ) { | 113 | if ( whichApp == CHMOD_APP ) { |
114 | theMode=*argv; | 114 | theMode = *argv; |
115 | } else { | 115 | } else { |
116 | 116 | ||
117 | /* Find the selected group */ | 117 | /* Find the selected group */ |
diff --git a/coreutils/date.c b/coreutils/date.c index 6be89df3e..77e7c39db 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
@@ -204,10 +204,10 @@ date_main(int argc, char * * argv) | |||
204 | } | 204 | } |
205 | } else { | 205 | } else { |
206 | if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) | 206 | if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) |
207 | date_fmt=*argv; | 207 | date_fmt = *argv; |
208 | else if (date_str == NULL) { | 208 | else if (date_str == NULL) { |
209 | set_time = 1; | 209 | set_time = 1; |
210 | date_str=*argv; | 210 | date_str = *argv; |
211 | } else { | 211 | } else { |
212 | usage ( date_usage); | 212 | usage ( date_usage); |
213 | } | 213 | } |
@@ -204,10 +204,10 @@ date_main(int argc, char * * argv) | |||
204 | } | 204 | } |
205 | } else { | 205 | } else { |
206 | if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) | 206 | if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) |
207 | date_fmt=*argv; | 207 | date_fmt = *argv; |
208 | else if (date_str == NULL) { | 208 | else if (date_str == NULL) { |
209 | set_time = 1; | 209 | set_time = 1; |
210 | date_str=*argv; | 210 | date_str = *argv; |
211 | } else { | 211 | } else { |
212 | usage ( date_usage); | 212 | usage ( date_usage); |
213 | } | 213 | } |
@@ -70,7 +70,7 @@ int find_main(int argc, char **argv) | |||
70 | argv++; | 70 | argv++; |
71 | 71 | ||
72 | if ( argc > 0 && **argv != '-') { | 72 | if ( argc > 0 && **argv != '-') { |
73 | directory=*argv; | 73 | directory = *argv; |
74 | argc--; | 74 | argc--; |
75 | argv++; | 75 | argv++; |
76 | } | 76 | } |
@@ -89,8 +89,8 @@ int find_main(int argc, char **argv) | |||
89 | case 'n': | 89 | case 'n': |
90 | if (strcmp(*argv, "name")==0) { | 90 | if (strcmp(*argv, "name")==0) { |
91 | if (argc-- > 1) { | 91 | if (argc-- > 1) { |
92 | pattern=*(++argv); | 92 | pattern = *(++argv); |
93 | stopit=-TRUE; | 93 | stopit=TRUE; |
94 | } else { | 94 | } else { |
95 | usage (find_usage); | 95 | usage (find_usage); |
96 | } | 96 | } |
diff --git a/findutils/find.c b/findutils/find.c index 40a508f05..47ce21ec4 100644 --- a/findutils/find.c +++ b/findutils/find.c | |||
@@ -70,7 +70,7 @@ int find_main(int argc, char **argv) | |||
70 | argv++; | 70 | argv++; |
71 | 71 | ||
72 | if ( argc > 0 && **argv != '-') { | 72 | if ( argc > 0 && **argv != '-') { |
73 | directory=*argv; | 73 | directory = *argv; |
74 | argc--; | 74 | argc--; |
75 | argv++; | 75 | argv++; |
76 | } | 76 | } |
@@ -89,8 +89,8 @@ int find_main(int argc, char **argv) | |||
89 | case 'n': | 89 | case 'n': |
90 | if (strcmp(*argv, "name")==0) { | 90 | if (strcmp(*argv, "name")==0) { |
91 | if (argc-- > 1) { | 91 | if (argc-- > 1) { |
92 | pattern=*(++argv); | 92 | pattern = *(++argv); |
93 | stopit=-TRUE; | 93 | stopit=TRUE; |
94 | } else { | 94 | } else { |
95 | usage (find_usage); | 95 | usage (find_usage); |
96 | } | 96 | } |
@@ -154,7 +154,7 @@ void message(int device, char *fmt, ...) | |||
154 | } | 154 | } |
155 | 155 | ||
156 | #else | 156 | #else |
157 | static int log_fd=-1; | 157 | static int log_fd = -1; |
158 | 158 | ||
159 | /* Take full control of the log tty, and never close it. | 159 | /* Take full control of the log tty, and never close it. |
160 | * It's mine, all mine! Muhahahaha! */ | 160 | * It's mine, all mine! Muhahahaha! */ |
@@ -166,7 +166,7 @@ void message(int device, char *fmt, ...) | |||
166 | device = CONSOLE; | 166 | device = CONSOLE; |
167 | } | 167 | } |
168 | else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) { | 168 | else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) { |
169 | log_fd=-1; | 169 | log_fd = -1; |
170 | fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); | 170 | fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); |
171 | fflush(stderr); | 171 | fflush(stderr); |
172 | return; | 172 | return; |
diff --git a/init/init.c b/init/init.c index 722ccd217..d88b64ba2 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -154,7 +154,7 @@ void message(int device, char *fmt, ...) | |||
154 | } | 154 | } |
155 | 155 | ||
156 | #else | 156 | #else |
157 | static int log_fd=-1; | 157 | static int log_fd = -1; |
158 | 158 | ||
159 | /* Take full control of the log tty, and never close it. | 159 | /* Take full control of the log tty, and never close it. |
160 | * It's mine, all mine! Muhahahaha! */ | 160 | * It's mine, all mine! Muhahahaha! */ |
@@ -166,7 +166,7 @@ void message(int device, char *fmt, ...) | |||
166 | device = CONSOLE; | 166 | device = CONSOLE; |
167 | } | 167 | } |
168 | else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) { | 168 | else if ((log_fd = device_open(log, O_RDWR|O_NDELAY)) < 0) { |
169 | log_fd=-1; | 169 | log_fd = -1; |
170 | fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); | 170 | fprintf(stderr, "Bummer, can't write to log on %s!\r\n", log); |
171 | fflush(stderr); | 171 | fflush(stderr); |
172 | return; | 172 | return; |
@@ -161,7 +161,7 @@ extern int logger_main(int argc, char **argv) | |||
161 | message=buf; | 161 | message=buf; |
162 | } else { | 162 | } else { |
163 | if (argc>=1) { | 163 | if (argc>=1) { |
164 | message=*argv; | 164 | message = *argv; |
165 | } else { | 165 | } else { |
166 | fprintf(stderr, "No message\n"); | 166 | fprintf(stderr, "No message\n"); |
167 | exit( FALSE); | 167 | exit( FALSE); |
@@ -354,9 +354,9 @@ extern int mount_main (int argc, char **argv) | |||
354 | } | 354 | } |
355 | } else { | 355 | } else { |
356 | if (device == NULL) | 356 | if (device == NULL) |
357 | device=*argv; | 357 | device = *argv; |
358 | else if (directory == NULL) | 358 | else if (directory == NULL) |
359 | directory=*argv; | 359 | directory = *argv; |
360 | else { | 360 | else { |
361 | goto goodbye; | 361 | goto goodbye; |
362 | } | 362 | } |
diff --git a/sysklogd/logger.c b/sysklogd/logger.c index d7ae0233e..aab95b984 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c | |||
@@ -161,7 +161,7 @@ extern int logger_main(int argc, char **argv) | |||
161 | message=buf; | 161 | message=buf; |
162 | } else { | 162 | } else { |
163 | if (argc>=1) { | 163 | if (argc>=1) { |
164 | message=*argv; | 164 | message = *argv; |
165 | } else { | 165 | } else { |
166 | fprintf(stderr, "No message\n"); | 166 | fprintf(stderr, "No message\n"); |
167 | exit( FALSE); | 167 | exit( FALSE); |
diff --git a/util-linux/mount.c b/util-linux/mount.c index 4b0901f2a..4c9e77be0 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -354,9 +354,9 @@ extern int mount_main (int argc, char **argv) | |||
354 | } | 354 | } |
355 | } else { | 355 | } else { |
356 | if (device == NULL) | 356 | if (device == NULL) |
357 | device=*argv; | 357 | device = *argv; |
358 | else if (directory == NULL) | 358 | else if (directory == NULL) |
359 | directory=*argv; | 359 | directory = *argv; |
360 | else { | 360 | else { |
361 | goto goodbye; | 361 | goto goodbye; |
362 | } | 362 | } |