diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 19:10:46 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 19:10:46 +0200 |
| commit | 756e95e7822182f0bb75fc33284123c9b73f3d8f (patch) | |
| tree | 7c8a52e6dbe4cf14acf85252eae96f910bb67e0f /util-linux | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-756e95e7822182f0bb75fc33284123c9b73f3d8f.tar.gz busybox-w32-756e95e7822182f0bb75fc33284123c9b73f3d8f.tar.bz2 busybox-w32-756e95e7822182f0bb75fc33284123c9b73f3d8f.zip | |
ipcrm: small code shrink
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/ipcrm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c index 731216c06..e597ed637 100644 --- a/util-linux/ipcrm.c +++ b/util-linux/ipcrm.c | |||
| @@ -40,7 +40,7 @@ typedef enum type_id { | |||
| 40 | MSG | 40 | MSG |
| 41 | } type_id; | 41 | } type_id; |
| 42 | 42 | ||
| 43 | static int remove_ids(type_id type, int argc, char **argv) | 43 | static int remove_ids(type_id type, char **argv) |
| 44 | { | 44 | { |
| 45 | unsigned long id; | 45 | unsigned long id; |
| 46 | int nb_errors = 0; | 46 | int nb_errors = 0; |
| @@ -48,7 +48,7 @@ static int remove_ids(type_id type, int argc, char **argv) | |||
| 48 | 48 | ||
| 49 | arg.val = 0; | 49 | arg.val = 0; |
| 50 | 50 | ||
| 51 | while (argc) { | 51 | while (argv[0]) { |
| 52 | id = bb_strtoul(argv[0], NULL, 10); | 52 | id = bb_strtoul(argv[0], NULL, 10); |
| 53 | if (errno || id > INT_MAX) { | 53 | if (errno || id > INT_MAX) { |
| 54 | bb_error_msg("invalid id: %s", argv[0]); | 54 | bb_error_msg("invalid id: %s", argv[0]); |
| @@ -67,7 +67,6 @@ static int remove_ids(type_id type, int argc, char **argv) | |||
| 67 | nb_errors++; | 67 | nb_errors++; |
| 68 | } | 68 | } |
| 69 | } | 69 | } |
| 70 | argc--; | ||
| 71 | argv++; | 70 | argv++; |
| 72 | } | 71 | } |
| 73 | 72 | ||
| @@ -109,7 +108,7 @@ int ipcrm_main(int argc, char **argv) | |||
| 109 | else if (w == 'e') | 108 | else if (w == 'e') |
| 110 | what = SEM; | 109 | what = SEM; |
| 111 | 110 | ||
| 112 | if (remove_ids(what, argc-2, &argv[2])) | 111 | if (remove_ids(what, &argv[2])) |
| 113 | fflush_stdout_and_exit(EXIT_FAILURE); | 112 | fflush_stdout_and_exit(EXIT_FAILURE); |
| 114 | printf("resource(s) deleted\n"); | 113 | printf("resource(s) deleted\n"); |
| 115 | return 0; | 114 | return 0; |