Contextual goo for -Wall, and remove some stasic specifiers

1 files changed, 23 insertions, 23 deletions

diff --git a/sys/compat/ibcs2/ibcs2_ipc.c b/sys/compat/ibcs2/ibcs2_ipc.c
index 5b07fa40f3c..bacbe15e34a 100644
--- a/sys/compat/ibcs2/ibcs2_ipc.c
+++ b/sys/compat/ibcs2/ibcs2_ipc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_ipc.c,v 1.3 1996/08/02 20:35:07 niklas Exp $	*/
+/*	$OpenBSD: ibcs2_ipc.c,v 1.4 1996/10/17 19:15:47 niklas Exp $	*/
 /*	$NetBSD: ibcs2_ipc.c,v 1.6 1996/05/03 17:05:23 christos Exp $	*/
 
 /*
@@ -67,6 +67,7 @@
 #define IBCS2_IPC_SET	1
 #define IBCS2_IPC_STAT	2
 
+#ifdef SYSVMSG
 /*
  * iBCS2 msgsys call
  */
@@ -85,10 +86,10 @@ struct ibcs2_msqid_ds {
 	ibcs2_time_t msg_ctime;
 };
 
-static void cvt_msqid2imsqid __P((struct msqid_ds *, struct ibcs2_msqid_ds *));
-static void cvt_imsqid2msqid __P((struct ibcs2_msqid_ds *, struct msqid_ds *));
+void cvt_msqid2imsqid __P((struct msqid_ds *, struct ibcs2_msqid_ds *));
+void cvt_imsqid2msqid __P((struct ibcs2_msqid_ds *, struct msqid_ds *));
 
-static void
+void
 cvt_msqid2imsqid(bp, ibp)
 	struct msqid_ds *bp;
 	struct ibcs2_msqid_ds *ibp;
@@ -107,7 +108,7 @@ cvt_msqid2imsqid(bp, ibp)
 	return;
 }
 
-static void
+void
 cvt_imsqid2msqid(ibp, bp)
 	struct ibcs2_msqid_ds *ibp;
 	struct msqid_ds *bp;
@@ -142,7 +143,6 @@ ibcs2_sys_msgsys(p, v, retval)
 	} */ *uap = v;
 
 	switch (SCARG(uap, which)) {
-#ifdef SYSVMSG
 	case 0:				/* msgget */
 		SCARG(uap, which) = 1;
 		return compat_10_sys_msgsys(p, uap, retval);
@@ -180,13 +180,14 @@ ibcs2_sys_msgsys(p, v, retval)
 	case 3:				/* msgsnd */
 		SCARG(uap, which) = 2;
 		return compat_10_sys_msgsys(p, uap, retval);
-#endif
 	default:
 		return EINVAL;
 	}
 }
+#endif
 
 
+#ifdef SYSVSEM
 /*
  * iBCS2 semsys call
  */
@@ -207,13 +208,13 @@ struct ibcs2_sem {
 	u_short semzcnt;
 };
 
-static void cvt_semid2isemid __P((struct semid_ds *, struct ibcs2_semid_ds *));
-static void cvt_isemid2semid __P((struct ibcs2_semid_ds *, struct semid_ds *));
+void cvt_semid2isemid __P((struct semid_ds *, struct ibcs2_semid_ds *));
+void cvt_isemid2semid __P((struct ibcs2_semid_ds *, struct semid_ds *));
 #ifdef notdef
-static void cvt_sem2isem __P((struct sem *, struct ibcs2_sem *));
-static void cvt_isem2sem __P((struct ibcs2_sem *, struct sem *));
+void cvt_sem2isem __P((struct sem *, struct ibcs2_sem *));
+void cvt_isem2sem __P((struct ibcs2_sem *, struct sem *));
 
-static void
+void
 cvt_sem2isem(bp, ibp)
 	struct sem *bp;
 	struct ibcs2_sem *ibp;
@@ -225,7 +226,7 @@ cvt_sem2isem(bp, ibp)
 	return;
 }
 
-static void
+void
 cvt_isem2sem(ibp, bp)
 	struct ibcs2_sem *ibp;
 	struct sem *bp;
@@ -238,7 +239,7 @@ cvt_isem2sem(ibp, bp)
 }
 #endif
 
-static void
+void
 cvt_semid2isemid(bp, ibp)
 	struct semid_ds *bp;
 	struct ibcs2_semid_ds *ibp;
@@ -251,7 +252,7 @@ cvt_semid2isemid(bp, ibp)
 	return;
 }
 
-static void
+void
 cvt_isemid2semid(ibp, bp)
 	struct ibcs2_semid_ds *ibp;
 	struct semid_ds *bp;
@@ -279,7 +280,6 @@ ibcs2_sys_semsys(p, v, retval)
 	} */ *uap = v;
 	int error;
 
-#ifdef SYSVSEM
 	switch (SCARG(uap, which)) {
 	case 0:					/* semctl */
 		switch(SCARG(uap, a4)) {
@@ -328,11 +328,12 @@ ibcs2_sys_semsys(p, v, retval)
 	case 2:				/* semop */
 		return compat_10_sys_semsys(p, uap, retval);
 	}
-#endif
 	return EINVAL;
 }
+#endif
 
 
+#ifdef SYSVSHM
 /*
  * iBCS2 shmsys call
  */
@@ -351,10 +352,10 @@ struct ibcs2_shmid_ds {
 	ibcs2_time_t shm_ctime;
 };
 
-static void cvt_shmid2ishmid __P((struct shmid_ds *, struct ibcs2_shmid_ds *));
-static void cvt_ishmid2shmid __P((struct ibcs2_shmid_ds *, struct shmid_ds *));
+void cvt_shmid2ishmid __P((struct shmid_ds *, struct ibcs2_shmid_ds *));
+void cvt_ishmid2shmid __P((struct ibcs2_shmid_ds *, struct shmid_ds *));
 
-static void
+void
 cvt_shmid2ishmid(bp, ibp)
 	struct shmid_ds *bp;
 	struct ibcs2_shmid_ds *ibp;
@@ -371,7 +372,7 @@ cvt_shmid2ishmid(bp, ibp)
 	return;
 }
 
-static void
+void
 cvt_ishmid2shmid(ibp, bp)
 	struct ibcs2_shmid_ds *ibp;
 	struct shmid_ds *bp;
@@ -402,7 +403,6 @@ ibcs2_sys_shmsys(p, v, retval)
 	} */ *uap = v;
 	int error;
 
-#ifdef SYSVSHM
 	switch (SCARG(uap, which)) {
 	case 0:						/* shmat */
 		return compat_10_sys_shmsys(p, uap, retval);
@@ -454,6 +454,6 @@ ibcs2_sys_shmsys(p, v, retval)
 	case 3:						/* shmget */
 		return compat_10_sys_shmsys(p, uap, retval);
 	}
-#endif
 	return EINVAL;
 }
+#endif