Skip to content

Commit 19358d6

Browse files
ndosschendossche
committed
Stop using reserved names
1 parent 335d6f0 commit 19358d6

File tree

4 files changed

+119
-119
lines changed

4 files changed

+119
-119
lines changed

‎ext/xml/compat.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#ifdef LIBXML_EXPAT_COMPAT
2323

2424
static void
25-
_qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI, xmlChar **qualified)
25+
qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI, xmlChar **qualified)
2626
{
2727
if (URI) {
2828
/* Use libxml functions otherwise its memory deallocation is screwed up */
@@ -35,7 +35,7 @@ _qualify_namespace(XML_Parser parser, const xmlChar *name, const xmlChar *URI, x
3535
}
3636

3737
static void
38-
_start_element_handler(void *user, const xmlChar *name, const xmlChar **attributes)
38+
start_element_handler(void *user, const xmlChar *name, const xmlChar **attributes)
3939
{
4040
XML_Parser parser = (XML_Parser) user;
4141
xmlChar *qualified_name = NULL;
@@ -71,7 +71,7 @@ _start_element_handler(void *user, const xmlChar *name, const xmlChar **attribut
7171
}
7272

7373
static void
74-
_start_element_handler_ns(void *user, const xmlChar *name, const xmlChar *prefix, const xmlChar *URI, int nb_namespaces, const xmlChar ** namespaces, int nb_attributes, int nb_defaulted, const xmlChar ** attributes)
74+
start_element_handler_ns(void *user, const xmlChar *name, const xmlChar *prefix, const xmlChar *URI, int nb_namespaces, const xmlChar ** namespaces, int nb_attributes, int nb_defaulted, const xmlChar ** attributes)
7575
{
7676
XML_Parser parser = (XML_Parser) user;
7777
xmlChar *qualified_name = NULL;
@@ -150,7 +150,7 @@ _start_element_handler_ns(void *user, const xmlChar *name, const xmlChar *prefix
150150
}
151151
return;
152152
}
153-
_qualify_namespace(parser, name, URI, &qualified_name);
153+
qualify_namespace(parser, name, URI, &qualified_name);
154154

155155
if (attributes != NULL) {
156156
xmlChar *qualified_name_attr = NULL;
@@ -159,7 +159,7 @@ _start_element_handler_ns(void *user, const xmlChar *name, const xmlChar *prefix
159159
for (i = 0; i < nb_attributes; i += 1) {
160160

161161
if (attributes[y+1] != NULL) {
162-
_qualify_namespace(parser, attributes[y] , attributes[y + 2], &qualified_name_attr);
162+
qualify_namespace(parser, attributes[y] , attributes[y + 2], &qualified_name_attr);
163163
} else {
164164
qualified_name_attr = xmlStrdup(attributes[y]);
165165
}
@@ -182,7 +182,7 @@ _start_element_handler_ns(void *user, const xmlChar *name, const xmlChar *prefix
182182
}
183183

184184
static void
185-
_end_element_handler(void *user, const xmlChar *name)
185+
end_element_handler(void *user, const xmlChar *name)
186186
{
187187
XML_Parser parser = (XML_Parser) user;
188188

@@ -201,7 +201,7 @@ _end_element_handler(void *user, const xmlChar *name)
201201
}
202202

203203
static void
204-
_end_element_handler_ns(void *user, const xmlChar *name, const xmlChar * prefix, const xmlChar *URI)
204+
end_element_handler_ns(void *user, const xmlChar *name, const xmlChar * prefix, const xmlChar *URI)
205205
{
206206
xmlChar *qualified_name;
207207
XML_Parser parser = (XML_Parser) user;
@@ -222,15 +222,15 @@ _end_element_handler_ns(void *user, const xmlChar *name, const xmlChar * prefix,
222222
return;
223223
}
224224

225-
_qualify_namespace(parser, name, URI, &qualified_name);
225+
qualify_namespace(parser, name, URI, &qualified_name);
226226

227227
parser->h_end_element(parser->user, (const XML_Char *) qualified_name);
228228

229229
xmlFree(qualified_name);
230230
}
231231

232232
static void
233-
_cdata_handler(void *user, const xmlChar *cdata, int cdata_len)
233+
cdata_handler(void *user, const xmlChar *cdata, int cdata_len)
234234
{
235235
XML_Parser parser = (XML_Parser) user;
236236

@@ -245,7 +245,7 @@ _cdata_handler(void *user, const xmlChar *cdata, int cdata_len)
245245
}
246246

247247
static void
248-
_pi_handler(void *user, const xmlChar *target, const xmlChar *data)
248+
pi_handler(void *user, const xmlChar *target, const xmlChar *data)
249249
{
250250
XML_Parser parser = (XML_Parser) user;
251251

@@ -263,7 +263,7 @@ _pi_handler(void *user, const xmlChar *target, const xmlChar *data)
263263
}
264264

265265
static void
266-
_unparsed_entity_decl_handler(void *user,
266+
unparsed_entity_decl_handler(void *user,
267267
const xmlChar *name,
268268
const xmlChar *pub_id,
269269
const xmlChar *sys_id,
@@ -279,7 +279,7 @@ _unparsed_entity_decl_handler(void *user,
279279
}
280280

281281
static void
282-
_notation_decl_handler(void *user, const xmlChar *notation, const xmlChar *pub_id, const xmlChar *sys_id)
282+
notation_decl_handler(void *user, const xmlChar *notation, const xmlChar *pub_id, const xmlChar *sys_id)
283283
{
284284
XML_Parser parser = (XML_Parser) user;
285285

@@ -291,7 +291,7 @@ _notation_decl_handler(void *user, const xmlChar *notation, const xmlChar *pub_i
291291
}
292292

293293
static void
294-
_build_comment(const xmlChar *data, size_t data_len, xmlChar **comment, size_t *comment_len)
294+
build_comment(const xmlChar *data, size_t data_len, xmlChar **comment, size_t *comment_len)
295295
{
296296
*comment_len = data_len + 7;
297297

@@ -304,22 +304,22 @@ _build_comment(const xmlChar *data, size_t data_len, xmlChar **comment, size_t *
304304
}
305305

306306
static void
307-
_comment_handler(void *user, const xmlChar *comment)
307+
comment_handler(void *user, const xmlChar *comment)
308308
{
309309
XML_Parser parser = (XML_Parser) user;
310310

311311
if (parser->h_default) {
312312
xmlChar *d_comment;
313313
size_t d_comment_len;
314314

315-
_build_comment(comment, (size_t) xmlStrlen(comment), &d_comment, &d_comment_len);
315+
build_comment(comment, (size_t) xmlStrlen(comment), &d_comment, &d_comment_len);
316316
parser->h_default(parser->user, d_comment, d_comment_len);
317317
xmlFree(d_comment);
318318
}
319319
}
320320

321321
static void
322-
_build_entity(const xmlChar *name, size_t len, xmlChar **entity, size_t *entity_len)
322+
build_entity(const xmlChar *name, size_t len, xmlChar **entity, size_t *entity_len)
323323
{
324324
*entity_len = len + 2;
325325
*entity = xmlMalloc(*entity_len + 1);
@@ -330,7 +330,7 @@ _build_entity(const xmlChar *name, size_t len, xmlChar **entity, size_t *entity_
330330
}
331331

332332
static void
333-
_external_entity_ref_handler(void *user, const xmlChar *names, const xmlChar *sys_id, const xmlChar *pub_id)
333+
external_entity_ref_handler(void *user, const xmlChar *names, const xmlChar *sys_id, const xmlChar *pub_id)
334334
{
335335
XML_Parser parser = (XML_Parser) user;
336336

@@ -345,7 +345,7 @@ _external_entity_ref_handler(void *user, const xmlChar *names, const xmlChar *sy
345345
}
346346

347347
static xmlEntityPtr
348-
_get_entity(void *user, const xmlChar *name)
348+
get_entity(void *user, const xmlChar *name)
349349
{
350350
XML_Parser parser = (XML_Parser) user;
351351
xmlEntityPtr ret = NULL;
@@ -362,7 +362,7 @@ _get_entity(void *user, const xmlChar *name)
362362
xmlChar *entity;
363363
size_t len;
364364

365-
_build_entity(name, (size_t) xmlStrlen(name), &entity, &len);
365+
build_entity(name, (size_t) xmlStrlen(name), &entity, &len);
366366
parser->h_default(parser->user, (const xmlChar *) entity, len);
367367
xmlFree(entity);
368368
} else {
@@ -374,7 +374,7 @@ _get_entity(void *user, const xmlChar *name)
374374
}
375375
} else {
376376
if (ret->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY) {
377-
_external_entity_ref_handler(user, ret->name, ret->SystemID, ret->ExternalID);
377+
external_entity_ref_handler(user, ret->name, ret->SystemID, ret->ExternalID);
378378
}
379379
}
380380
}
@@ -390,32 +390,32 @@ php_xml_compat_handlers = {
390390
NULL, /* hasInternalSubset */
391391
NULL, /* hasExternalSubset */
392392
NULL, /* resolveEntity */
393-
_get_entity, /* getEntity */
393+
get_entity, /* getEntity */
394394
NULL, /* entityDecl */
395-
_notation_decl_handler,
395+
notation_decl_handler,
396396
NULL, /* attributeDecl */
397397
NULL, /* elementDecl */
398-
_unparsed_entity_decl_handler, /* unparsedEntity */
398+
unparsed_entity_decl_handler, /* unparsedEntity */
399399
NULL, /* setDocumentLocator */
400400
NULL, /* startDocument */
401401
NULL, /* endDocument */
402-
_start_element_handler, /* startElement */
403-
_end_element_handler, /* endElement */
402+
start_element_handler, /* startElement */
403+
end_element_handler, /* endElement */
404404
NULL, /* reference */
405-
_cdata_handler,
405+
cdata_handler,
406406
NULL, /* ignorableWhitespace */
407-
_pi_handler,
408-
_comment_handler, /* comment */
407+
pi_handler,
408+
comment_handler, /* comment */
409409
NULL, /* warning */
410410
NULL, /* error */
411411
NULL, /* fatalError */
412412
NULL, /* getParameterEntity */
413-
_cdata_handler, /* cdataBlock */
413+
cdata_handler, /* cdataBlock */
414414
NULL, /* externalSubset */
415415
XML_SAX2_MAGIC,
416416
NULL,
417-
_start_element_handler_ns,
418-
_end_element_handler_ns,
417+
start_element_handler_ns,
418+
end_element_handler_ns,
419419
NULL
420420
};
421421

@@ -439,8 +439,8 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
439439
{
440440
XML_Parser parser;
441441

442-
parser = (XML_Parser) emalloc(sizeof(struct _XML_Parser));
443-
memset(parser, 0, sizeof(struct _XML_Parser));
442+
parser = emalloc(sizeof(struct XML_Parser_Struct));
443+
memset(parser, 0, sizeof(struct XML_Parser_Struct));
444444
parser->use_namespace = 0;
445445
parser->_ns_separator = NULL;
446446

‎ext/xml/expat_compat.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ typedef int (*XML_ExternalEntityRefHandler)(void *, const XML_Char *, const XML
5959
typedef void (*XML_StartNamespaceDeclHandler)(void *, const XML_Char *, const XML_Char *);
6060
typedef void (*XML_EndNamespaceDeclHandler)(void *, const XML_Char *);
6161

62-
typedef struct _XML_Memory_Handling_Suite {
62+
typedef struct XML_Memory_Handling_Suite {
6363
void *(*malloc_fcn)(size_t size);
6464
void *(*realloc_fcn)(void *ptr, size_t size);
6565
void (*free_fcn)(void *ptr);
6666
} XML_Memory_Handling_Suite;
6767

68-
typedef struct _XML_Parser {
68+
typedef struct XML_Parser_Struct {
6969
int use_namespace;
7070

7171
xmlChar *_ns_separator;

‎ext/xml/tests/bug72714.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #72714 (_xml_startElementHandler() segmentation fault)
2+
Bug #72714 (xml_startElementHandler() segmentation fault)
33
--EXTENSIONS--
44
xml
55
--SKIPIF--

0 commit comments

Comments
 (0)