blob: 9aa641b2338a8461a02b396242aa92f0f72b5a98 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
*** include/libxml/tree.h.orig Mon Aug 22 05:14:24 2005
--- include/libxml/tree.h Sat Jan 7 22:30:25 2006
***************
*** 452,459 ****
struct _xmlAttr *properties;/* properties list */
xmlNs *nsDef; /* namespace definitions on this node */
void *psvi; /* for type/PSVI informations */
! unsigned short line; /* line number */
unsigned short extra; /* extra data for XPath/XSLT */
};
/**
--- 452,460 ----
struct _xmlAttr *properties;/* properties list */
xmlNs *nsDef; /* namespace definitions on this node */
void *psvi; /* for type/PSVI informations */
! unsigned short line16; /* line number */
unsigned short extra; /* extra data for XPath/XSLT */
+ int line; /* line number */
};
/**
*** SAX2.c.orig Sat Sep 3 08:27:39 2005
--- ./SAX2.c Sat Jan 7 22:34:34 2006
***************
*** 1562,1570 ****
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line = (short) ctxt->input->line;
else
! ret->line = 65535;
}
}
--- 1562,1571 ----
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line16 = (unsigned short) ctxt->input->line;
else
! ret->line16 = 65535;
! ret->line = ctxt->input->line;
}
}
***************
*** 2165,2173 ****
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line = (short) ctxt->input->line;
else
! ret->line = 65535;
}
}
--- 2166,2175 ----
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line16 = (unsigned short) ctxt->input->line;
else
! ret->line16 = 65535;
! ret->line = ctxt->input->line;
}
}
***************
*** 2508,2516 ****
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line = (short) ctxt->input->line;
else
! ret->line = 65535;
}
}
if (ctxt->inSubset == 1) {
--- 2510,2519 ----
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line16 = (unsigned short) ctxt->input->line;
else
! ret->line16 = 65535;
! ret->line = ctxt->input->line;
}
}
if (ctxt->inSubset == 1) {
***************
*** 2568,2576 ****
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line = (short) ctxt->input->line;
else
! ret->line = 65535;
}
}
--- 2571,2580 ----
if (ctxt->linenumbers) {
if (ctxt->input != NULL) {
if (ctxt->input->line < 65535)
! ret->line16 = (unsigned short) ctxt->input->line;
else
! ret->line16 = 65535;
! ret->line = ctxt->input->line;
}
}
|