pap, remove or #if 0 unused static stuff

diff --git a/bin/pap/pap.c b/bin/pap/pap.c
index 82f87c10c0d31c3e9a49fd817b61bdf5b03976be..a8c97adc501455e0479aba564575d4c572011416 100644 (file)
--- a/bin/pap/pap.c
+++ b/bin/pap/pap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pap.c,v 1.13 2009-10-14 02:24:05 didg Exp $
+ * $Id: pap.c,v 1.14 2009-10-16 01:10:59 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -30,7 +30,6 @@
 #define FUCKED
 
 #define _PATH_PAPRC    ".paprc"
-static char    *nbpfailure = "AppleTalk printer offline";
 
 /* Forward Declarations */
 static void updatestatus(char *s, int len);
@@ -465,7 +464,7 @@ int main( int ac, char      **av)
 
 static int             data = 0;
 static unsigned char   port;
-static u_int16_t       seq = 0, rseq = 1;
+static u_int16_t       seq = 0;
 
 static int send_file( int fd, ATP atp, int lastfile)
 {

diff --git a/etc/papd/lp.c b/etc/papd/lp.c
index 017cee89f6de460e90d9dd1b097611f04bc0de9f..033571b3733b94204092d164c8dc096c7566c77c 100644 (file)
--- a/etc/papd/lp.c
+++ b/etc/papd/lp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: lp.c,v 1.29 2009-10-14 01:38:28 didg Exp $
+ * $Id: lp.c,v 1.30 2009-10-16 01:10:59 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -208,6 +208,8 @@ static void lp_setup_comments (charset_t dest)
 
 #define is_var(a, b) (strncmp((a), (b), 2) == 0)
 
+#if 0
+/* removed, it's not used and a pain to get it right from a security POV */
 static size_t quote(char *dest, char *src, const size_t bsize, size_t len)
 {
 size_t used = 0;
@@ -234,7 +236,6 @@ size_t used = 0;
     return used;
 }
 
-
 static char* pipexlate(char *src)
 {
     char *p, *q, *dest; 
@@ -302,7 +303,7 @@ static char* pipexlate(char *src)
     }
     return destbuf;
 }
-
+#endif
 
 void lp_person(char *person)
 {

diff --git a/etc/papd/session.c b/etc/papd/session.c
index d59680559b35fc527d10487cefa950105fb91517..7067f5f0acb18a25a5eed03a1edb89ad74c72c7d 100644 (file)
--- a/etc/papd/session.c
+++ b/etc/papd/session.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session.c,v 1.19 2009-10-14 02:24:05 didg Exp $
+ * $Id: session.c,v 1.20 2009-10-16 01:10:59 didg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -46,16 +46,6 @@ static struct iovec  niov[ PAP_MAXQUANTUM ] = {
     { buf[ 6 ],        0 },
     { buf[ 7 ],        0 },
 };
-static struct iovec    iov[ PAP_MAXQUANTUM ] = {
-    { buf[ 0 ] + 4,    0 },
-    { buf[ 1 ] + 4,    0 },
-    { buf[ 2 ] + 4,    0 },
-    { buf[ 3 ] + 4,    0 },
-    { buf[ 4 ] + 4,    0 },
-    { buf[ 5 ] + 4,    0 },
-    { buf[ 6 ] + 4,    0 },
-    { buf[ 7 ] + 4,    0 },
-};
 
 /*
  * Accept files until the client closes the connection.