X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Futils.c;h=062b17e4a8db64cc11e42c43ffe184219f313f51;hb=7e54469ed4f3c2ecc1006475dcd10df1d1fe35d3;hp=1033f9d3702df418fcb8f0acf694917e1a7bcfed;hpb=2939b77dbbd091dbe690876ca0f2394c96e0d43c;p=ppp.git diff --git a/pppd/utils.c b/pppd/utils.c index 1033f9d..062b17e 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -10,16 +10,11 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The name(s) of the authors of this software must not be used to + * 2. The name(s) of the authors of this software must not be used to * endorse or promote products derived from this software without * prior written permission. * - * 4. Redistributions of any form whatsoever must retain the following + * 3. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by Paul Mackerras * ". @@ -33,7 +28,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: utils.c,v 1.23 2004/01/13 04:13:08 paulus Exp $" +#define RCSID "$Id: utils.c,v 1.25 2008/06/03 12:06:37 paulus Exp $" #include #include @@ -241,8 +236,8 @@ vslprintf(buf, buflen, fmt, args) base = 10; break; default: - *buf++ = '%'; --buflen; - *buf++ = 'l'; --buflen; + OUTCHAR('%'); + OUTCHAR('l'); --fmt; /* so %lz outputs %lz etc. */ continue; } @@ -532,7 +527,7 @@ static int llevel; /* level for logging */ void init_pr_log(prefix, level) - char *prefix; + const char *prefix; int level; { linep = line;