ipcrm: small code shrink
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
e4dcba1c10
commit
756e95e782
@ -40,7 +40,7 @@ typedef enum type_id {
|
|||||||
MSG
|
MSG
|
||||||
} type_id;
|
} type_id;
|
||||||
|
|
||||||
static int remove_ids(type_id type, int argc, char **argv)
|
static int remove_ids(type_id type, char **argv)
|
||||||
{
|
{
|
||||||
unsigned long id;
|
unsigned long id;
|
||||||
int nb_errors = 0;
|
int nb_errors = 0;
|
||||||
@ -48,7 +48,7 @@ static int remove_ids(type_id type, int argc, char **argv)
|
|||||||
|
|
||||||
arg.val = 0;
|
arg.val = 0;
|
||||||
|
|
||||||
while (argc) {
|
while (argv[0]) {
|
||||||
id = bb_strtoul(argv[0], NULL, 10);
|
id = bb_strtoul(argv[0], NULL, 10);
|
||||||
if (errno || id > INT_MAX) {
|
if (errno || id > INT_MAX) {
|
||||||
bb_error_msg("invalid id: %s", argv[0]);
|
bb_error_msg("invalid id: %s", argv[0]);
|
||||||
@ -67,7 +67,6 @@ static int remove_ids(type_id type, int argc, char **argv)
|
|||||||
nb_errors++;
|
nb_errors++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
argc--;
|
|
||||||
argv++;
|
argv++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,7 +108,7 @@ int ipcrm_main(int argc, char **argv)
|
|||||||
else if (w == 'e')
|
else if (w == 'e')
|
||||||
what = SEM;
|
what = SEM;
|
||||||
|
|
||||||
if (remove_ids(what, argc-2, &argv[2]))
|
if (remove_ids(what, &argv[2]))
|
||||||
fflush_stdout_and_exit(EXIT_FAILURE);
|
fflush_stdout_and_exit(EXIT_FAILURE);
|
||||||
printf("resource(s) deleted\n");
|
printf("resource(s) deleted\n");
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user