X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fpapd%2Fmain.c;h=6fac410f7c3ab3395eb146b4d7a40503ddab8d2c;hb=815d557e167e76015934397dffbfa869180dcdbc;hp=3ef3910ce0d926f56de9f7de34218996e0c7b91b;hpb=d3d14dd89146930f0a69cb94ca65f3b06198484c;p=netatalk.git

diff --git a/etc/papd/main.c b/etc/papd/main.c
index 3ef3910c..6fac410f 100644
--- a/etc/papd/main.c
+++ b/etc/papd/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.26 2009-02-02 08:50:50 didg Exp $
+ * $Id: main.c,v 1.27 2009-10-13 22:55:37 didg Exp $
  *
  * Copyright (c) 1990,1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -104,11 +104,8 @@ static void papd_exit(const int i)
   exit(i);
 }
 
-#if !defined( ibm032 ) && !defined( _IBMR2 )
-    void
-#endif /* ! ibm032 && ! _IBMR2 */
-die( n )
-    int			n;
+void
+die(int n)
 {
     struct printer	*pr;
     struct at_addr	addr;
@@ -136,10 +133,8 @@ die( n )
     papd_exit( n );
 }
 
-#if !defined( ibm032 ) && !defined( _IBMR2 )
-    void
-#endif /* ! ibm032 && ! _IBMR2 */
-reap()
+void
+reap(int sig _U_)
 {
     int		status;
     int		pid;
@@ -166,9 +161,7 @@ reap()
 
 char		rbuf[ 255 + 1 + 8 ];
 
-int main( ac, av )
-    int		ac;
-    char	**av;
+int main(int ac, char **av)
 {
     extern char         *optarg;
 
@@ -567,9 +560,7 @@ int main( ac, av )
  * We assume buf is big enough for 255 bytes of data and a length byte.
  */
 
-int getstatus( pr, buf )
-    struct printer	*pr;
-    char		*buf;
+int getstatus(struct printer *pr, char *buf)
 {
 
 #ifdef HAVE_CUPS
@@ -612,13 +603,12 @@ int getstatus( pr, buf )
 #endif /* HAVE_CUPS */
 }
 
-char	*pgetstr();
+char	*pgetstr(char *id, char **area);
 char	*getpname(char **area, int bufsize);
 
 #define PF_CONFBUFFER	1024
 
-static void getprinters( cf )
-    char	*cf;
+static void getprinters( char *cf)
 {
     char		buf[ PF_CONFBUFFER ], area[ PF_CONFBUFFER ], *a, *p, *name, *type, *zone;
     struct printer	*pr;
@@ -804,8 +794,7 @@ static void getprinters( cf )
     }
 }
 
-int rprintcap( pr )
-    struct printer	*pr;
+int rprintcap( struct printer *pr)
 {
 
 #ifdef HAVE_CUPS