Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-projects commit in pax-utils: dumpelf.c
Date: Tue, 01 Dec 2009 05:48:22
Message-Id: E1NFLb0-0008HP-Rz@stork.gentoo.org
1 vapier 09/12/01 05:48:18
2
3 Modified: dumpelf.c
4 Log:
5 avoid using reserved keyword "bool"
6
7 Revision Changes Path
8 1.25 pax-utils/dumpelf.c
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/dumpelf.c?rev=1.25&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/dumpelf.c?rev=1.25&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/dumpelf.c?r1=1.24&r2=1.25
13
14 Index: dumpelf.c
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-projects/pax-utils/dumpelf.c,v
17 retrieving revision 1.24
18 retrieving revision 1.25
19 diff -u -r1.24 -r1.25
20 --- dumpelf.c 17 Jan 2008 04:37:19 -0000 1.24
21 +++ dumpelf.c 1 Dec 2009 05:48:18 -0000 1.25
22 @@ -1,13 +1,13 @@
23 /*
24 * Copyright 2005-2007 Gentoo Foundation
25 * Distributed under the terms of the GNU General Public License v2
26 - * $Header: /var/cvsroot/gentoo-projects/pax-utils/dumpelf.c,v 1.24 2008/01/17 04:37:19 solar Exp $
27 + * $Header: /var/cvsroot/gentoo-projects/pax-utils/dumpelf.c,v 1.25 2009/12/01 05:48:18 vapier Exp $
28 *
29 * Copyright 2005-2007 Ned Ludd - <solar@g.o>
30 * Copyright 2005-2007 Mike Frysinger - <vapier@g.o>
31 */
32
33 -static const char *rcsid = "$Id: dumpelf.c,v 1.24 2008/01/17 04:37:19 solar Exp $";
34 +static const char *rcsid = "$Id: dumpelf.c,v 1.25 2009/12/01 05:48:18 vapier Exp $";
35 const char * const argv0 = "dumpelf";
36
37 #include "paxinc.h"
38 @@ -206,19 +206,19 @@
39 break; \
40 } \
41 case SHT_STRTAB: { \
42 - char bool; \
43 + char b; \
44 printf("\n\t/%c section dump:\n", '*'); \
45 - bool = 1; \
46 + b = 1; \
47 if (type == SHT_PROGBITS) --data; \
48 for (i = 0; i < size; ++i) { \
49 ++data; \
50 if (*data) { \
51 - if (bool) printf("\t * "); \
52 + if (b) printf("\t * "); \
53 printf("%c", *data); \
54 - bool = 0; \
55 - } else if (!bool) { \
56 + b = 0; \
57 + } else if (!b) { \
58 printf("\n"); \
59 - bool = 1; \
60 + b = 1; \
61 } \
62 } \
63 printf("\t */\n"); \