Renamed 'struct comment' to 'struct papd_comment' because 'struct comment' was alread...

diff --git a/etc/papd/comment.c b/etc/papd/comment.c
index 426627182c0f776b2cc4b3d78ff067f9bf503a31..71b6d58f68a856bafc1172dcb5978e983094ae0a 100644 (file)
--- a/etc/papd/comment.c
+++ b/etc/papd/comment.c
@@ -29,7 +29,7 @@ compop()
 }
 
 compush( comment )
-    struct comment     *comment;
+    struct papd_comment        *comment;
 {
     struct comstate    *cs;
 
@@ -46,10 +46,10 @@ compush( comment )
 }
 
 comswitch( comments, handler )
-    struct comment     *comments;
+    struct papd_comment        *comments;
     int                        (*handler)();
 {
-    struct comment     *c, *comment = NULL;
+    struct papd_comment        *c, *comment = NULL;
 
     for ( c = comments; c->c_begin; c++ ) {
        if ( c->c_handler == handler ) {
@@ -86,12 +86,12 @@ comcmp( start, stop, str, how )
     return( 1 );
 }
 
-    struct comment *
+    struct papd_comment *
 commatch( start, stop, comments )
     char               *start, *stop;
-    struct comment     comments[];
+    struct papd_comment        comments[];
 {
-    struct comment     *comment;
+    struct papd_comment        *comment;
 
     for ( comment = comments; comment->c_begin; comment++ ) {
        if ( comcmp( start, stop, comment->c_begin, comment->c_flags ) == 0 ) {

diff --git a/etc/papd/comment.h b/etc/papd/comment.h
index 2e12765f778dda8a37a8627bd9678db0f364e577..482846caac353db6e8278e46eac8598d2e6ba219 100644 (file)
--- a/etc/papd/comment.h
+++ b/etc/papd/comment.h
@@ -3,7 +3,7 @@
  * All Rights Reserved.  See COPYRIGHT.
  */
 
-struct comment {
+struct papd_comment {
     char               *c_begin;
     char               *c_end;
     int                        (*c_handler)();
@@ -15,17 +15,17 @@ struct comment {
 #define CH_ERROR       -1
 
 struct comstate {
-    struct comment     *cs_comment;
+    struct papd_comment        *cs_comment;
     struct comstate    *cs_prev;
     int                        cs_flags;
 };
 
-extern struct comment  *commatch();
-extern struct comstate *comstate;
-extern struct comment  magics[];
-extern struct comment  queries[];
-extern struct comment  headers[];
-extern char            *comcont;
+extern struct papd_comment     *commatch();
+extern struct comstate         *comstate;
+extern struct papd_comment     magics[];
+extern struct papd_comment     queries[];
+extern struct papd_comment     headers[];
+extern char                    *comcont;
 
 #define compeek()      (comstate==NULL?NULL:(comstate->cs_comment))
 #define comgetflags()  (comstate->cs_flags)

diff --git a/etc/papd/headers.c b/etc/papd/headers.c
index 075c59a286ce1fbbf1247ce125856a2d345c4581..51ef0b1beb6b7af25d73df68b9a29727a738f2bc 100644 (file)
--- a/etc/papd/headers.c
+++ b/etc/papd/headers.c
@@ -19,7 +19,7 @@ ch_title( in, out )
 {
     char               *start, *stop, *p, *q, c;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
 
     switch ( markline( in, &start, &linelength, &crlflength )) {
     case 0 :
@@ -65,7 +65,7 @@ ch_title( in, out )
 /*
  * "Header" comments.
  */
-struct comment headers[] = {
+struct papd_comment    headers[] = {
     { "%%Title:",                      0,              ch_title,       0 },
     { 0 },
 };

diff --git a/etc/papd/magics.c b/etc/papd/magics.c
index 6fb497308bf455f4fabbd7cfd1396ace0c1f2e9e..c3209d5741ad21b326e6f2bc343ee08ce3c79fbc 100644 (file)
--- a/etc/papd/magics.c
+++ b/etc/papd/magics.c
@@ -21,7 +21,7 @@ ps( infile, outfile, sat )
 {
     char                       *start;
     int                                linelength, crlflength;
-    struct comment             *comment;
+    struct papd_comment                *comment;
 
     for (;;) {
        if ( comment = compeek()) {
@@ -73,7 +73,7 @@ cm_psquery( in, out, sat )
     struct papfile     *in, *out;
     struct sockaddr_at *sat;
 {
-    struct comment     *comment;
+    struct papd_comment        *comment;
     char               *start;
     int                        linelength, crlflength;
 
@@ -148,7 +148,7 @@ cm_psswitch( in, out, sat )
 {
     char               *start, *stop, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
 
     switch ( markline( in, &start, &linelength, &crlflength )) {
     case 0 :
@@ -188,7 +188,7 @@ cm_psswitch( in, out, sat )
     return( CH_DONE );
 }
 
-struct comment magics[] = {
+struct papd_comment    magics[] = {
     { "%!PS-Adobe-3.0 Query",  0,                      cm_psquery, C_FULL },
     { "%!PS-Adobe-3.0",                0,                      cm_psadobe, C_FULL },
     { "%!PS-Adobe-",           0,                      cm_psswitch,    0 },

diff --git a/etc/papd/queries.c b/etc/papd/queries.c
index 6a926e1bb142a69a045ee7a5ff43c98419006605..44e8019d77a5bd0148cc580c4da7529ff955ae1f 100644 (file)
--- a/etc/papd/queries.c
+++ b/etc/papd/queries.c
@@ -34,7 +34,7 @@ cq_default( in, out )
 {
     char               *start, *stop, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
 
     for (;;) {
        switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -91,7 +91,7 @@ cq_k4login( in, out )
     char               *start, *p;
     int                        linelength, crlflength;
     unsigned char      *t;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     KTEXT_ST           tkt;
     AUTH_DAT           ad;
     int                        rc, i;
@@ -143,7 +143,7 @@ cq_uameth( in, out )
 {
     char               *start;
     int                        linelength, crlflength;
-    struct comment     *c, *comment = compeek();
+    struct papd_comment        *c, *comment = compeek();
 
     for (;;) {
        switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -286,7 +286,7 @@ cq_query( in, out )
 {
     char               *start, *stop, *p, *q;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     struct genquery    *gq;
 
 
@@ -390,7 +390,7 @@ cq_font( in, out )
 {
     char               *start, *stop, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
 
     for (;;) {
        switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -447,7 +447,7 @@ cq_feature( in, out )
 {
     char               *start, *stop, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     struct ppd_feature *pfe;
 
     for (;;) {
@@ -505,7 +505,7 @@ cq_printer( in, out )
 {
     char               *start, *p;
     int                        linelength, crlflength;
-    struct comment     *comment = compeek();
+    struct papd_comment        *comment = compeek();
     struct ppd_feature *pdpsver, *pdprod;
 
     for (;;) {
@@ -656,11 +656,11 @@ ignored ]%%\r";
 cq_rbilogin( in, out )
     struct papfile      *in, *out;
 {
-    char        *start, *stop, *p, *begin;
-    int                linelength, crlflength;
-    char        username[9] = "\0";
-    struct comment      *comment = compeek();
-    char       uamtype[20] = "\0";
+    char               *start, *stop, *p, *begin;
+    int                        linelength, crlflength;
+    char               username[9] = "\0";
+    struct papd_comment        *comment = compeek();
+    char               uamtype[20] = "\0";
 
     for (;;) {
         switch ( markline( in, &start, &linelength, &crlflength )) {
@@ -713,7 +713,7 @@ cq_rbilogin( in, out )
  * All queries start with %%?Begin and end with %%?End.  Note that the
  * "Begin"/"End" general queries have to be last.
  */
-struct comment queries[] = {
+struct papd_comment    queries[] = {
 #ifdef KRB
     { "%%Login: UMICHKerberosIV", 0,                   cq_k4login,     0 },
     { "%%?BeginUAMethodsQuery",        "%%?EndUAMethodsQuery:", cq_uameth, C_FULL },