rendered paste body--- ipcrm.c.orig Mon Nov 26 13:33:29 2007
+++ ipcrm.c Mon Nov 26 13:37:37 2007
@@ -144,8 +144,8 @@
usage(void)
{
fprintf(stderr, "%s\n%s\n",
- "usage: ipcrm [-q msqid] [-m shmid] [-s semid]",
- " [-Q msgkey] [-M shmkey] [-S semkey] ...");
+ "usage: ipcrm [-q msqid] [-m shmid] [-s semid]",
+ " [-Q msgkey] [-M shmkey] [-S semkey] ...");
exit(1);
}
@@ -169,7 +169,8 @@
num = msginfo.msgmni;
while (num-- && !signaled)
if (kxmsqids[num].u.msg_qbytes != 0) {
- id = IXSEQ_TO_IPCID(num, kxmsqids[num].u.msg_perm);
+ id = IXSEQ_TO_IPCID(num,
+ kxmsqids[num].u.msg_perm);
if (msgctl(id, IPC_RMID, NULL) < 0) {
warn("msqid(%d): ", id);
errflg++;
@@ -200,7 +201,8 @@
num = shminfo.shmmni;
while (num-- && !signaled)
if (kxshmids[num].u.shm_perm.mode & 0x0800) {
- id = IXSEQ_TO_IPCID(num, kxshmids[num].u.shm_perm);
+ id = IXSEQ_TO_IPCID(num,
+ kxshmids[num].u.shm_perm);
if (shmctl(id, IPC_RMID, NULL) < 0) {
warn("shmid(%d): ", id);
errflg++;
@@ -233,7 +235,8 @@
num = seminfo.semmni;
while (num-- && !signaled)
if ((kxsema[num].u.sem_perm.mode & SEM_ALLOC) != 0) {
- id = IXSEQ_TO_IPCID(num, kxsema[num].u.sem_perm);
+ id = IXSEQ_TO_IPCID(num,
+ kxsema[num].u.sem_perm);
if (semctl(id, IPC_RMID, NULL) < 0) {
warn("semid(%d): ", id);
errflg++;
@@ -259,7 +262,6 @@
errflg = 0;
signal(SIGSYS, not_configured);
while ((c = getopt(argc, argv, ":q:m:s:Q:M:S:y")) != -1) {
-
signaled = 0;
switch (c) {
case 'q':
@@ -275,10 +277,12 @@
if (result < 0) {
errflg++;
if (!signaled)
- warn("%sid(%d): ", IPC_TO_STR(toupper(c)), target_id);
+ warn("%sid(%d): ",
+ IPC_TO_STR(toupper(c)), target_id);
else
- warnx("%ss are not configured in the running kernel",
- IPC_TO_STRING(toupper(c)));
+ warnx("%ss are not configured in "
+ "the running kernel",
+ IPC_TO_STRING(toupper(c)));
}
break;
case 'Q':
@@ -286,7 +290,8 @@
case 'S':
target_key = atol(optarg);
if (target_key == IPC_PRIVATE) {
- warnx("can't remove private %ss", IPC_TO_STRING(c));
+ warnx("can't remove private %ss",
+ IPC_TO_STRING(c));
continue;
}
if (c == 'Q')
@@ -298,17 +303,20 @@
if (result < 0) {
errflg++;
if (!signaled)
- warn("%ss(%ld): ", IPC_TO_STR(c), target_key);
+ warn("%ss(%ld): ",
+ IPC_TO_STR(c), target_key);
else
- warnx("%ss are not configured in the running kernel",
- IPC_TO_STRING(c));
+ warnx("%ss are not configured in "
+ "the running kernel",
+ IPC_TO_STRING(c));
}
break;
case 'y':
use_sysctl = 0;
break;
case ':':
- fprintf(stderr, "option -%c requires an argument\n", optopt);
+ fprintf(stderr,
+ "option -%c requires an argument\n", optopt);
usage();
case '?':
fprintf(stderr, "unrecognized option: -%c\n", optopt);
@@ -340,7 +348,7 @@
err(1, "sysctlbyname: %s", xp->sysctl);
if (tsiz != xp->size)
errx(1, "%s size mismatch (expected %d, got %d)",
- xp->sysctl, xp->size, tsiz);
+ xp->sysctl, xp->size, tsiz);
}
}
@@ -379,7 +387,7 @@
for (i = 0; symbols[i].n_name != NULL; i++)
if (symbols[i].n_value == 0)
warnx("symbol %s not found",
- symbols[i].n_name);
+ symbols[i].n_name);
#endif
break;
}
@@ -441,8 +449,8 @@
err(1, "sysctlbyname: %s", sym2sysctl[idx]);
if (tsiz != size)
errx(1, "%s size mismatch "
- "(expected %d, got %d)",
- sym2sysctl[idx], size, tsiz);
+ "(expected %d, got %d)",
+ sym2sysctl[idx], size, tsiz);
break;
}
}