author | zihao.zhu@oracle.com <zihao.zhu@oracle.com> |
Mon, 17 Oct 2016 09:22:53 -0700 | |
changeset 7116 | 24e5d18aa27c |
parent 5600 | 55d0d4d6900a |
permissions | -rw-r--r-- |
5600
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch uses a "belt & suspenders" approach: either the inclusion of |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
<sys/types.h> before the define, or changing the variable name is sufficient, |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
but both are used out of precaution. The patch was developed in-house; |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
the changing of the variable name part has been fed upstream and will be |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
included in the next version. |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
|
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
--- xmlto-0.0.28/xmlif/xmlif.c.~1~ 2015-11-10 04:05:27.000000000 -0800 |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
+++ xmlto-0.0.28/xmlif/xmlif.c 2016-03-14 13:33:03.905766962 -0700 |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
@@ -20,6 +20,7 @@ |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
#include <string.h> |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
#include <errno.h> |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
#include <stdlib.h> |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
+#include <sys/types.h> |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
|
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
/* end standard C headers. */ |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
|
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -1306,7 +1307,7 @@ |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
|
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
#define INITIAL 0 |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
#define attrib 1 |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
-#define val 2 |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
+#define xmlif_val 2 |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
|
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
#ifndef YY_NO_UNISTD_H |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
/* Special case for "unistd.h", since it is non-ANSI. We include it way |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
26 |
@@ -1594,7 +1595,7 @@ |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
27 |
case 8: |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
28 |
YY_RULE_SETUP |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
29 |
#line 217 "xmlif/xmlif.l" |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
30 |
-{BEGIN(val);} |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
31 |
+{BEGIN(xmlif_val);} |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
32 |
YY_BREAK |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
33 |
case 9: |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
34 |
YY_RULE_SETUP |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
35 |
@@ -1636,7 +1637,7 @@ |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
36 |
#line 1637 "xmlif/xmlif.c" |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
37 |
case YY_STATE_EOF(INITIAL): |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
38 |
case YY_STATE_EOF(attrib): |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
39 |
-case YY_STATE_EOF(val): |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
40 |
+case YY_STATE_EOF(xmlif_val): |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
41 |
yyterminate(); |
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
42 |
|
55d0d4d6900a
22928059 xmlto uses poor variable name
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
43 |
case YY_END_OF_BUFFER: |