aboutsummaryrefslogtreecommitdiff
path: root/util-linux/ipcrm.c
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux/ipcrm.c')
-rw-r--r--util-linux/ipcrm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 6360c706f..731216c06 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -43,7 +43,6 @@ typedef enum type_id {
43static int remove_ids(type_id type, int argc, char **argv) 43static int remove_ids(type_id type, int argc, char **argv)
44{ 44{
45 unsigned long id; 45 unsigned long id;
46 int ret = 0; /* silence gcc */
47 int nb_errors = 0; 46 int nb_errors = 0;
48 union semun arg; 47 union semun arg;
49 48
@@ -55,6 +54,7 @@ static int remove_ids(type_id type, int argc, char **argv)
55 bb_error_msg("invalid id: %s", argv[0]); 54 bb_error_msg("invalid id: %s", argv[0]);
56 nb_errors++; 55 nb_errors++;
57 } else { 56 } else {
57 int ret = 0;
58 if (type == SEM) 58 if (type == SEM)
59 ret = semctl(id, 0, IPC_RMID, arg); 59 ret = semctl(id, 0, IPC_RMID, arg);
60 else if (type == MSG) 60 else if (type == MSG)
@@ -92,14 +92,13 @@ int ipcrm_main(int argc, char **argv)
92 type_id what = 0; /* silence gcc */ 92 type_id what = 0; /* silence gcc */
93 char w; 93 char w;
94 94
95 w=argv[1][0]; 95 w = argv[1][0];
96 if ( ((w == 'm' && argv[1][1] == 's' && argv[1][2] == 'g') 96 if ( ((w == 'm' && argv[1][1] == 's' && argv[1][2] == 'g')
97 || (argv[1][0] == 's' 97 || (argv[1][0] == 's'
98 && ((w=argv[1][1]) == 'h' || w == 'e') 98 && ((w = argv[1][1]) == 'h' || w == 'e')
99 && argv[1][2] == 'm') 99 && argv[1][2] == 'm')
100 ) && argv[1][3] == '\0' 100 ) && argv[1][3] == '\0'
101 ) { 101 ) {
102
103 if (argc < 3) 102 if (argc < 3)
104 bb_show_usage(); 103 bb_show_usage();
105 104