Date: Fri, 17 May 2002 02:47:59 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11442 for review Message-ID: <200205170947.g4H9lxf74691@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11442 Change 11442 by peter@peter_overcee on 2002/05/17 02:47:29 IFC @11441 (sync up libgcc/Makefile with cvs too) Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#12 integrate ... //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#5 integrate Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.42 2002/05/17 04:18:33 obrien Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.43 2002/05/17 08:59:13 peter Exp $ .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" ==== //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.13 2002/05/17 07:14:55 tjr Exp $"; + "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.14 2002/05/17 08:54:32 tjr Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -423,9 +423,9 @@ } if (fchar == 'd') digits++; - asprintf(&hdfmt, "%lu/%lu \"%%%s%d%c \" \"\\n\"", - 16UL / (u_long)isize, (u_long)isize, - (fchar == 'd' || fchar == 'u') ? "" : "0", digits, fchar); + asprintf(&hdfmt, "%lu/%lu \"%*s%%%s%d%c\" \"\\n\"", + 16UL / (u_long)isize, (u_long)isize, (int)(4 * isize - digits), + "", (fchar == 'd' || fchar == 'u') ? "" : "0", digits, fchar); if (hdfmt == NULL) err(1, NULL); odadd(hdfmt); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205170947.g4H9lxf74691>