Newer GCC complains that foo != NULL is tautological, if foo is a local

variable, so deal with it.

3 files changed, 46 insertions, 1 deletions

diff --git a/print/LPRng-core/distinfo b/print/LPRng-core/distinfo
index 3485419cf17..3fafd4d80d2 100644
--- a/print/LPRng-core/distinfo
+++ b/print/LPRng-core/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2008/07/27 17:16:37 joerg Exp $
+$NetBSD: distinfo,v 1.12 2011/11/25 22:15:18 joerg Exp $
 
 SHA1 (LPRng-3.8.28.tgz) = f4373004adb1439819600701bb98517137daf1fc
 RMD160 (LPRng-3.8.28.tgz) = f0460d7fa7d1ea0ce6b49fcb656905fdda3d0d41
@@ -13,3 +13,5 @@ SHA1 (patch-ag) = bc84154636da3b331076b1051c1e70a9f65c858b
 SHA1 (patch-ah) = 3c1b75ed1db210cd3d9033f59ecb43176b158a39
 SHA1 (patch-ai) = 5b5f91911970f7033e22b67e0a5775102de9e313
 SHA1 (patch-aj) = d0e6974244893a1519a4da570a6dd6a10174379f
+SHA1 (patch-src_common_lpbanner.c) = 0e745092cf4222a3b2bf2e13f495fd4c7711bb2e
+SHA1 (patch-src_common_plp__snprintf.c) = 83d6c12818fafae53fda4b34c7ba5364166c6303
diff --git a/print/LPRng-core/patches/patch-src_common_lpbanner.c b/print/LPRng-core/patches/patch-src_common_lpbanner.c
new file mode 100644
index 00000000000..6e101387d8d
--- /dev/null
+++ b/print/LPRng-core/patches/patch-src_common_lpbanner.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_lpbanner.c,v 1.1 2011/11/25 22:15:18 joerg Exp $
+
+--- src/common/lpbanner.c.orig	2011-11-25 13:32:31.000000000 +0000
++++ src/common/lpbanner.c
+@@ -1540,7 +1540,7 @@ void banner(void)
+ 		strncpy( jobnumber, controlfile+3, 3 );
+ 		jobnumber[3] = 0;
+ 	}
+-	if(jobnumber && *jobnumber ) seebig( &len, Font9x8.height, &bigjobnumber );
++	if( *jobnumber ) seebig( &len, Font9x8.height, &bigjobnumber );
+ 	if(bnrname && *bnrname) seebig( &len, Font9x8.height, &biglogname );
+ 	if(host && *host ) seebig( &len, Font9x8.height, &bigfromhost );
+ 	if(job && *job) seebig( &len, Font9x8.height, &bigjobname );
diff --git a/print/LPRng-core/patches/patch-src_common_plp__snprintf.c b/print/LPRng-core/patches/patch-src_common_plp__snprintf.c
new file mode 100644
index 00000000000..c9c2cb63809
--- /dev/null
+++ b/print/LPRng-core/patches/patch-src_common_plp__snprintf.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_common_plp__snprintf.c,v 1.1 2011/11/25 22:15:18 joerg Exp $
+
+--- src/common/plp_snprintf.c.orig	2004-09-24 20:19:58.000000000 +0000
++++ src/common/plp_snprintf.c
+@@ -933,7 +933,7 @@
+ 	}
+ 	convert[2*i] = 0;
+ 
+-	place = safestrlen(convert);
++	place = strlen(convert);
+ 	padlen = len - place;
+ 	if( padlen < 0 ) padlen = 0;
+ 	if( ljust ) padlen = -padlen;
+@@ -991,13 +991,13 @@
+ 	if( ljust ) mystrcat(formatstr, "-" ); /* 1 */
+ 	if( zpad ) mystrcat(formatstr, "0" );	/* 1 */
+ 	if( len >= 0 ){
+-		sprintf( formatstr+safestrlen(formatstr), "%d", len ); /* 3 */
++		sprintf( formatstr+strlen(formatstr), "%d", len ); /* 3 */
+ 	}
+ 	if( precision >= 0 ){
+-		sprintf( formatstr+safestrlen(formatstr), ".%d", precision ); /* 3 */
++		sprintf( formatstr+strlen(formatstr), ".%d", precision ); /* 3 */
+ 	}
+ 	/* format string will be at most 10 chars long ... */
+-	sprintf( formatstr+safestrlen(formatstr), "%c", fmt );
++	sprintf( formatstr+strlen(formatstr), "%c", fmt );
+ 	/* this is easier than trying to do the portable dtostr */
+ 	/* fprintf(stderr,"format string '%s'\n", formatstr); */
+ 	sprintf( convert, formatstr, value );