replaced all #include <sys/syslog.h> with #include <syslog.h>

[netatalk.git] / etc / papd / ppd.c

diff --git a/etc/papd/ppd.c b/etc/papd/ppd.c
index d560f772b9d7b902828e95456c4798e1a0988aad..64af1f38b7d96a640196e724b999eccaddcb7abd 100644 (file)
--- a/etc/papd/ppd.c
+++ b/etc/papd/ppd.c
@@ -1,12 +1,18 @@
 /*
+ * $Id: ppd.c,v 1.7 2002-01-03 17:49:39 sibaz Exp $
+ *
  * Copyright (c) 1995 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/syslog.h>
+#include <syslog.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -42,19 +48,18 @@ struct ppdent {
 #ifndef SHOWPPD
 int ppd_inited = 0;
 
-ppd_init()
+int ppd_init()
 {
     if ( ppd_inited ) {
        return( -1 );
     }
     ppd_inited++;
 
-    read_ppd( printer->p_ppdfile, 0 );
+    return read_ppd( printer->p_ppdfile, 0 );
 }
-#endif SHOWPPD
+#endif /* SHOWPPD */
 
-    struct ppdent *
-getppdent( stream )
+struct ppdent *getppdent( stream )
     FILE       *stream;
 {
     static char                        buf[ 1024 ];
@@ -74,10 +79,10 @@ getppdent( stream )
        }
 
        q = p;
-       while ( *p != ' ' && *p != '\t' && *p != ':' && *p != '\n' ) {
+       while ( (*p != ' ') && (*p != '\t') && (*p != ':') && (*p != '\n') ) {
            p++;
        }
-       if ( *( q + 1 ) == '%' || *( q + 1 ) == '?' ) { /* comments & queries */
+       if ( (*( q + 1 ) == '%') || (*( q + 1 ) == '?') ) {     /* comments & queries */
            continue;
        }
        ppdent.pe_main = q;
@@ -90,12 +95,12 @@ getppdent( stream )
        if ( *p != ':' ) {      /* option key word */
            *p++ = '\0';
 
-           while ( *p == ' ' || *p == '\t' ) {
+           while ( (*p == ' ') || (*p == '\t') ) {
                p++;
            }
 
            q = p;
-           while ( *p != ':' && *p != '/' && *p != '\n' ) {
+           while ( (*p != ':') && (*p != '/') && (*p != '\n') ) {
                p++;
            }
 
@@ -121,7 +126,7 @@ getppdent( stream )
        }
        *p++ = '\0';
 
-       while ( *p == ' ' || *p == '\t' ) {
+       while ( (*p == ' ') || (*p == '\t') ) {
            p++;
        }
 
@@ -139,7 +144,7 @@ getppdent( stream )
     return( NULL );
 }
 
-read_ppd( file, fcnt )
+int read_ppd( file, fcnt )
     char       *file;
     int                fcnt;
 {
@@ -199,7 +204,7 @@ read_ppd( file, fcnt )
                break;
            }
        }
-       if ( pfe->pd_name && pfe->pd_value == NULL ) {
+       if ( pfe->pd_name && (pfe->pd_value == NULL) ) {
            if (( pfe->pd_value =
                    (char *)malloc( strlen( pe->pe_value ) + 1 )) == NULL ) {
                syslog( LOG_ERR, "malloc: %m" );
@@ -215,8 +220,7 @@ read_ppd( file, fcnt )
     return( 0 );
 }
 
-    struct ppd_font *
-ppd_font( font )
+struct ppd_font *ppd_font( font )
     char       *font;
 {
     struct ppd_font    *pfo;
@@ -225,7 +229,7 @@ ppd_font( font )
     if ( ! ppd_inited ) {
        ppd_init();
     }
-#endif SHOWPPD
+#endif /* SHOWPPD */
 
     for ( pfo = ppd_fonts; pfo; pfo = pfo->pd_next ) {
        if ( strcmp( pfo->pd_font, font ) == 0 ) {
@@ -235,23 +239,23 @@ ppd_font( font )
     return( NULL );
 }
 
-    struct ppd_feature *
-ppd_feature( feature, len )
-    char       *feature;
+struct ppd_feature *ppd_feature( feature, len )
+    const char *feature;
     int                len;
 {
     struct ppd_feature *pfe;
-    char               main[ 256 ];
-    char               *end, *p, *q;
+    char               ppd_feature_main[ 256 ];
+    const char         *end, *p;
+    char               *q;
 
 #ifndef SHOWPPD
     if ( ! ppd_inited ) {
        ppd_init();
     }
-#endif SHOWPPD
+#endif /* SHOWPPD */
 
-    for ( end = feature + len, p = feature, q = main;
-           p <= end && *p != '\n' && *p != '\r'; p++, q++ ) {
+    for ( end = feature + len, p = feature, q = ppd_feature_main;
+           (p <= end) && (*p != '\n') && (*p != '\r'); p++, q++ ) {
        *q = *p;
     }
     if ( p > end ) {
@@ -260,7 +264,7 @@ ppd_feature( feature, len )
     *q = '\0';
 
     for ( pfe = ppd_features; pfe->pd_name; pfe++ ) {
-       if ( strcmp( pfe->pd_name, main ) == 0 && pfe->pd_value ) {
+       if ( (strcmp( pfe->pd_name, ppd_feature_main ) == 0) && pfe->pd_value ) {
            return( pfe );
        }
     }