file_cmds-321.100.10.0.1.tar.gz

[apple/file_cmds.git] / ipcrm / ipcrm.c

diff --git a/ipcrm/ipcrm.c b/ipcrm/ipcrm.c
index be2d3becdd4545508cdd5463be749b32c7777327..e90aaa1977ab1d8fe095e889325104934760f1cb 100644 (file)
--- a/ipcrm/ipcrm.c
+++ b/ipcrm/ipcrm.c
@@ -29,8 +29,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static const char rcsid[] =
+__used static const char rcsid[] =
        "$Id: ipcrm.c,v 1.3 2005/02/03 07:31:33 josborne Exp $";
 #endif /* not lint */
 
@@ -52,7 +53,7 @@ static const char rcsid[] =
 
 int signaled;
 
-void usage()
+static void usage(void)
 {
        fprintf(stderr, "%s\n%s\n",
                "usage: ipcrm [-q msqid] [-m shmid] [-s semid]",
@@ -60,9 +61,7 @@ void usage()
        exit(1);
 }
 
-int msgrm(key, id)
-    key_t key;
-    int id;
+static int msgrm(key_t key, int id)
 {
     if (key) {
        id = msgget(key, 0);
@@ -72,9 +71,7 @@ int msgrm(key, id)
     return msgctl(id, IPC_RMID, NULL);
 }
 
-int shmrm(key, id)
-    key_t key;
-    int id;
+static int shmrm(key_t key, int id)
 {
     if (key) {
        id = shmget(key, 0, 0);
@@ -84,21 +81,17 @@ int shmrm(key, id)
     return shmctl(id, IPC_RMID, NULL);
 }
 
-int semrm(key, id)
-    key_t key;
-    int id;
+static int semrm(key_t key, int id)
 {
-    union semun arg;
-
     if (key) {
        id = semget(key, 0, 0);
        if (id == -1)
            return -1;
     }
-    return semctl(id, 0, IPC_RMID, arg);
+    return semctl(id, 0, IPC_RMID);
 }
 
-void not_configured()
+static void not_configured(__unused int unused)
 {
     signaled++;
 }
@@ -121,7 +114,7 @@ int main(argc, argv)
        case 'q':
        case 'm':
        case 's':
-           target_id = strtol(optarg, &en, 0);
+           target_id = (int)strtol(optarg, &en, 0);
            if (*en) {
                warnx("%s: '%s' is not a number",
                    IPC_TO_STRING(toupper(c)), optarg);
@@ -145,7 +138,7 @@ int main(argc, argv)
        case 'Q':
        case 'M':
        case 'S':
-           target_key = strtol(optarg, &en, 0);
+           target_key = (key_t)strtol(optarg, &en, 0);
            if (*en) {
                warnx("%s: '%s' is not a number", IPC_TO_STRING(c), optarg);
                continue;
@@ -163,7 +156,7 @@ int main(argc, argv)
            if (result < 0) {
                errflg++;
                if (!signaled)
-                   warn("%s key(%ld): ", IPC_TO_STRING(c), target_key);
+                   warn("%s key(%d): ", IPC_TO_STRING(c), target_key);
                else
                    warnx("%ss are not configured in the running kernel",
                          IPC_TO_STRING(c));