ipcs: comment & white space clean up

Add to multiline comments to have left side stars, convert spaces
to tabs and indent preprocessor directives

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

1 files changed, 83 insertions, 86 deletions

diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index b59682941..09764b656 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -1,22 +1,19 @@
 /* Original author unknown, may be "krishna balasub@cis.ohio-state.edu" */
 /*
-
-  Modified Sat Oct  9 10:55:28 1993 for 0.99.13
-
-  Patches from Mike Jagdis (jaggy@purplet.demon.co.uk) applied Wed Feb
-  8 12:12:21 1995 by faith@cs.unc.edu to print numeric uids if no
-  passwd file entry.
-
-  Patch from arnolds@ifns.de (Heinz-Ado Arnolds) applied Mon Jul 1
-  19:30:41 1996 by janl@math.uio.no to add code missing in case PID:
-  clauses.
-
-  Patched to display the key field -- hy@picksys.com 12/18/96
-
-  1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
-  - added Native Language Support
-
-*/
+ * Modified Sat Oct  9 10:55:28 1993 for 0.99.13
+ *
+ * Patches from Mike Jagdis (jaggy@purplet.demon.co.uk) applied Wed Feb 8
+ * 12:12:21 1995 by faith@cs.unc.edu to print numeric uids if no passwd file
+ * entry.
+ *
+ * Patch from arnolds@ifns.de (Heinz-Ado Arnolds) applied Mon Jul 1 19:30:41
+ * 1996 by janl@math.uio.no to add code missing in case PID: clauses.
+ *
+ * Patched to display the key field -- hy@picksys.com 12/18/96
+ *
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
+ * - added Native Language Support
+ */
 
 #include <errno.h>
 #include <features.h>
@@ -37,48 +34,50 @@
 #include "c.h"
 #include "nls.h"
 
-/*-------------------------------------------------------------------*/
-/* SHM_DEST and SHM_LOCKED are defined in kernel headers,
-   but inside #ifdef __KERNEL__ ... #endif */
+/*
+ * SHM_DEST and SHM_LOCKED are defined in kernel headers, but inside
+ * #ifdef __KERNEL__ ... #endif
+ */
 #ifndef SHM_DEST
-/* shm_mode upper byte flags */
-#define SHM_DEST        01000   /* segment will be destroyed on last detach */
-#define SHM_LOCKED      02000   /* segment will not be swapped */
+  /* shm_mode upper byte flags */
+# define SHM_DEST	01000	/* segment will be destroyed on last detach */
+# define SHM_LOCKED	02000	/* segment will not be swapped */
 #endif
 
 /* For older kernels the same holds for the defines below */
 #ifndef MSG_STAT
-#define MSG_STAT	11
-#define MSG_INFO	12
+# define MSG_STAT	11
+# define MSG_INFO	12
 #endif
 
 #ifndef SHM_STAT
-#define SHM_STAT        13
-#define SHM_INFO        14
+# define SHM_STAT	13
+# define SHM_INFO	14
 struct shm_info {
-     int   used_ids;
-     ulong shm_tot; /* total allocated shm */
-     ulong shm_rss; /* total resident shm */
-     ulong shm_swp; /* total swapped shm */
-     ulong swap_attempts;
-     ulong swap_successes;
+	int used_ids;
+	ulong shm_tot;		/* total allocated shm */
+	ulong shm_rss;		/* total resident shm */
+	ulong shm_swp;		/* total swapped shm */
+	ulong swap_attempts;
+	ulong swap_successes;
 };
 #endif
 
 #ifndef SEM_STAT
-#define SEM_STAT	18
-#define SEM_INFO	19
+# define SEM_STAT	18
+# define SEM_INFO	19
 #endif
 
 /* Some versions of libc only define IPC_INFO when __USE_GNU is defined. */
 #ifndef IPC_INFO
-#define IPC_INFO        3
+# define IPC_INFO	3
 #endif
-/*-------------------------------------------------------------------*/
 
-/* The last arg of semctl is a union semun, but where is it defined?
-   X/OPEN tells us to define it ourselves, but until recently
-   Linux include files would also define it. */
+/*
+ * The last arg of semctl is a union semun, but where is it defined? X/OPEN
+ * tells us to define it ourselves, but until recently Linux include files
+ * would also define it.
+ */
 #ifndef HAVE_UNION_SEMUN
 /* according to X/OPEN we have to define it ourselves */
 union semun {
@@ -89,13 +88,15 @@ union semun {
 };
 #endif
 
-/* X/OPEN (Jan 1987) does not define fields key, seq in struct ipc_perm;
-   glibc-1.09 has no support for sysv ipc.
-   glibc 2 uses __key, __seq */
+/*
+ * X/OPEN (Jan 1987) does not define fields key, seq in struct ipc_perm;
+ *	glibc-1.09 has no support for sysv ipc.
+ *	glibc 2 uses __key, __seq
+ */
 #if defined (__GLIBC__) && __GLIBC__ >= 2
-#define KEY __key
+# define KEY __key
 #else
-#define KEY key
+# define KEY key
 #endif
 
 #define LIMITS 1
@@ -138,8 +139,8 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-int
-main (int argc, char **argv) {
+int main (int argc, char **argv)
+{
 	int opt, msg = 0, sem = 0, shm = 0, id=0, print=0;
 	char format = 0;
 	static const struct option longopts[] = {
@@ -206,9 +207,8 @@ main (int argc, char **argv) {
 		}
 	}
 
-
 	if  (print) {
-	        if (shm)
+		if (shm)
 			print_shm (id);
 		if (sem)
 			print_sem (id);
@@ -237,9 +237,8 @@ main (int argc, char **argv) {
 	return EXIT_SUCCESS;
 }
 
-
-static void
-print_perms (int id, struct ipc_perm *ipcp) {
+static void print_perms (int id, struct ipc_perm *ipcp)
+{
 	struct passwd *pw;
 	struct group *gr;
 
@@ -264,7 +263,6 @@ print_perms (int id, struct ipc_perm *ipcp) {
 		printf(" %-10u\n", ipcp->gid);
 }
 
-
 void do_shm (char format)
 {
 	int maxid, shmid, id;
@@ -285,8 +283,10 @@ void do_shm (char format)
 		printf (_("------ Shared Memory Limits --------\n"));
 		if ((shmctl (0, IPC_INFO, (struct shmid_ds *) (void *) &shminfo)) < 0 )
 			return;
-		/* glibc 2.1.3 and all earlier libc's have ints as fields
-		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */
+		/*
+		 * glibc 2.1.3 and all earlier libc's have ints as fields of
+		 * struct shminfo; glibc 2.1.91 has unsigned long; ach
+		 */
 		printf (_("max number of segments = %lu\n"),
 			(unsigned long) shminfo.shmmni);
 		printf (_("max seg size (kbytes) = %lu\n"),
@@ -299,21 +299,22 @@ void do_shm (char format)
 
 	case STATUS:
 		printf (_("------ Shared Memory Status --------\n"));
-		/* TRANSLATORS: This output format is mantained for backward compatibility
-		   as ipcs is used in scripts. For consistency with the rest, the translated
-		   form can follow this model:
-
-		   "segments allocated = %d\n"
-		   "pages allocated = %ld\n"
-		   "pages resident = %ld\n"
-		   "pages swapped = %ld\n"
-		   "swap performance = %ld attempts, %ld successes\n"
-		*/
+		/*
+		 * TRANSLATORS: This output format is mantained for backward
+		 * compatibility as ipcs is used in scripts. For consistency
+		 * with the rest, the translated form can follow this model:
+		 *
+		 * "segments allocated = %d\n"
+		 * "pages allocated = %ld\n"
+		 * "pages resident = %ld\n"
+		 * "pages swapped = %ld\n"
+		 * "swap performance = %ld attempts, %ld successes\n"
+		 */
 		printf (_("segments allocated %d\n"
-		          "pages allocated %ld\n"
-		          "pages resident  %ld\n"
-		          "pages swapped   %ld\n"
-		          "Swap performance: %ld attempts\t %ld successes\n"),
+			  "pages allocated %ld\n"
+			  "pages resident  %ld\n"
+			  "pages swapped   %ld\n"
+			  "Swap performance: %ld attempts\t %ld successes\n"),
 			shm_info.used_ids,
 			shm_info.shm_tot,
 			shm_info.shm_rss,
@@ -381,7 +382,7 @@ void do_shm (char format)
 			break;
 
 		default:
-		        printf("0x%08x ",ipcp->KEY );
+			printf("0x%08x ",ipcp->KEY );
 			if (pw)
 				printf ("%-10d %-10.10s", shmid, pw->pw_name);
 			else
@@ -405,7 +406,6 @@ void do_shm (char format)
 	return;
 }
 
-
 void do_sem (char format)
 {
 	int maxid, semid, id;
@@ -488,7 +488,7 @@ void do_sem (char format)
 			break;
 
 		default:
-		        printf("0x%08x ", ipcp->KEY);
+			printf("0x%08x ", ipcp->KEY);
 			if (pw)
 				printf ("%-10d %-10.10s", semid, pw->pw_name);
 			else
@@ -496,10 +496,10 @@ void do_sem (char format)
 			printf (" %-10o %-10ld\n",
 				ipcp->mode & 0777,
 				/*
-				 * glibc-2.1.3 and earlier has unsigned short;
-				 * glibc-2.1.91 has variation between
-				 * unsigned short and unsigned long
-				 * Austin prescribes unsigned short.
+				 * glibc-2.1.3 and earlier has unsigned
+				 * short. glibc-2.1.91 has variation between
+				 * unsigned short and unsigned long. Austin
+				 * prescribes unsigned short.
 				 */
 				(long) semary.sem_nsems);
 			break;
@@ -507,7 +507,6 @@ void do_sem (char format)
 	}
 }
 
-
 void do_msg (char format)
 {
 	int maxid, msqid, id;
@@ -597,7 +596,7 @@ void do_msg (char format)
 			break;
 
 		default:
-		        printf( "0x%08x ",ipcp->KEY );
+			printf( "0x%08x ",ipcp->KEY );
 			if (pw)
 				printf ("%-10d %-10.10s", msqid, pw->pw_name);
 			else
@@ -605,10 +604,10 @@ void do_msg (char format)
 			printf (" %-10o %-12ld %-12ld\n",
 				ipcp->mode & 0777,
 				/*
-				 * glibc-2.1.3 and earlier has unsigned short;
-				 * glibc-2.1.91 has variation between
-				 * unsigned short, unsigned long
-				 * Austin has msgqnum_t
+				 * glibc-2.1.3 and earlier has unsigned
+				 * short. glibc-2.1.91 has variation between
+				 * unsigned short, unsigned long. Austin has
+				 * msgqnum_t
 				 */
 				(long) msgque.msg_cbytes,
 				(long) msgque.msg_qnum);
@@ -618,7 +617,6 @@ void do_msg (char format)
 	return;
 }
 
-
 void print_shm (int shmid)
 {
 	struct shmid_ds shmds;
@@ -658,9 +656,8 @@ void print_msg (int msqid)
 		ipcp->uid, ipcp->gid, ipcp->cuid, ipcp->cgid, ipcp->mode);
 	printf (_("cbytes=%ld\tqbytes=%ld\tqnum=%ld\tlspid=%d\tlrpid=%d\n"),
 		/*
-		 * glibc-2.1.3 and earlier has unsigned short;
-		 * glibc-2.1.91 has variation between
-		 * unsigned short, unsigned long
+		 * glibc-2.1.3 and earlier has unsigned short. glibc-2.1.91
+		 * has variation between unsigned short, unsigned long.
 		 * Austin has msgqnum_t (for msg_qbytes)
 		 */
 		(long) buf.msg_cbytes, (long) buf.msg_qbytes,