From: Paul Mackerras <paulus@samba.org>
Date: Sun, 3 Feb 2013 03:56:18 +0000 (+1100)
Subject: pppd: Take out unused %r conversion completely
X-Git-Tag: ppp-2.4.7~32
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=356d8d558d844412119aa18c8e5a113bc6459c7b;p=ppp.git

pppd: Take out unused %r conversion completely

This just removes some code surrounded by #if 0/#endif, which Fedora
apparently feels the need to patch...

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/pppd/utils.c b/pppd/utils.c
index eb771a5..6cf80fe 100644
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -286,19 +286,6 @@ vslprintf(buf, buflen, fmt, args)
 		     (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
 	    str = num;
 	    break;
-#if 0	/* not used, and breaks on S/390, apparently */
-	case 'r':
-	    f = va_arg(args, char *);
-#ifndef __powerpc__
-	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
-#else
-	    /* On the powerpc, a va_list is an array of 1 structure */
-	    n = vslprintf(buf, buflen + 1, f, va_arg(args, void *));
-#endif
-	    buf += n;
-	    buflen -= n;
-	    continue;
-#endif
 	case 't':
 	    time(&t);
 	    str = ctime(&t);