summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2022-10-24 01:35:06 +0200
committerSebastian Pipping <sebastian@pipping.org>2022-10-24 16:00:15 +0200
commitfcb91e43bd4fe0ef21f1797f94b6ea02d03fcab9 (patch)
tree0b6f96d83de228e8521c343e0c0b1a6875c807d0
parent9c7bd378b6b008b99018d4374a2ec4172e9e4898 (diff)
downloadlibexpat-git-fcb91e43bd4fe0ef21f1797f94b6ea02d03fcab9.tar.gz
examples: Make passing of depth pointer consistent across examples
-rw-r--r--expat/examples/elements.c4
-rw-r--r--expat/examples/outline.c14
2 files changed, 9 insertions, 9 deletions
diff --git a/expat/examples/elements.c b/expat/examples/elements.c
index 0c959f35..1361edd8 100644
--- a/expat/examples/elements.c
+++ b/expat/examples/elements.c
@@ -58,7 +58,7 @@
static void XMLCALL
startElement(void *userData, const XML_Char *name, const XML_Char **atts) {
int i;
- int *depthPtr = (int *)userData;
+ int *const depthPtr = (int *)userData;
(void)atts;
for (i = 0; i < *depthPtr; i++)
@@ -69,7 +69,7 @@ startElement(void *userData, const XML_Char *name, const XML_Char **atts) {
static void XMLCALL
endElement(void *userData, const XML_Char *name) {
- int *depthPtr = (int *)userData;
+ int *const depthPtr = (int *)userData;
(void)name;
*depthPtr -= 1;
diff --git a/expat/examples/outline.c b/expat/examples/outline.c
index db36a503..0efa0eae 100644
--- a/expat/examples/outline.c
+++ b/expat/examples/outline.c
@@ -53,14 +53,12 @@
#define BUFFSIZE 8192
-int Depth;
-
static void XMLCALL
start(void *data, const XML_Char *el, const XML_Char **attr) {
int i;
- (void)data;
+ int *const depthPtr = (int *)data;
- for (i = 0; i < Depth; i++)
+ for (i = 0; i < *depthPtr; i++)
printf(" ");
printf("%" XML_FMT_STR, el);
@@ -70,27 +68,29 @@ start(void *data, const XML_Char *el, const XML_Char **attr) {
}
printf("\n");
- Depth++;
+ *depthPtr += 1;
}
static void XMLCALL
end(void *data, const XML_Char *el) {
- (void)data;
+ int *const depthPtr = (int *)data;
(void)el;
- Depth--;
+ *depthPtr -= 1;
}
int
main(void) {
char buf[BUFFSIZE];
XML_Parser parser = XML_ParserCreate(NULL);
+ int depth = 0;
if (! parser) {
fprintf(stderr, "Couldn't allocate memory for parser\n");
exit(-1);
}
+ XML_SetUserData(parser, &depth);
XML_SetElementHandler(parser, start, end);
for (;;) {