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
|
$NetBSD: patch-aa,v 1.5 2005/10/24 11:36:38 tonio Exp $
--- wvConfig.c.orig 2002-07-14 15:20:07.000000000 +0200
+++ wvConfig.c
@@ -2130,7 +2130,7 @@ exstartElement (void *userData, const ch
}
static void
-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
+wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts)
{
unsigned int nAtts = 0;
const XML_Char **p;
@@ -3094,7 +3094,7 @@ startElement (void *userData, const XML_
}
static void
-endElement (void *userData, const XML_Char *name)
+wvendElement (void *userData, const XML_Char *name)
{
state_data *mydata = (state_data *) userData;
unsigned int token_type;
@@ -3470,8 +3470,8 @@ wvParseConfig (state_data * myhandle)
memset(&hdl, 0, sizeof(hdl));
hdl.getEntity = _getEntity;
- hdl.startElement = startElement;
- hdl.endElement = endElement;
+ hdl.startElement = wvstartElement;
+ hdl.endElement = wvendElement;
hdl.characters = charData;
if (myhandle->fp)
@@ -3514,7 +3514,7 @@ wvParseConfig (state_data * myhandle)
size_t len;
XML_SetUserData (parser, myhandle);
- XML_SetElementHandler (parser, startElement, endElement);
+ XML_SetElementHandler (parser, wvstartElement, wvendElement);
XML_SetCharacterDataHandler (parser, charData);
if (myhandle->fp == NULL)
|
