summaryrefslogtreecommitdiff
path: root/navit/xmlconfig.c
diff options
context:
space:
mode:
authorsleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-06-30 23:07:15 +0000
committersleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-06-30 23:07:15 +0000
commit7c7753887db05491b0a5490c596eda4dfec88d36 (patch)
tree0f73cffc697322e02f07a393e6195d8ccad80f84 /navit/xmlconfig.c
parent3c2bc532366491895273f23ac3fea1cee9a127e1 (diff)
downloadnavit-7c7753887db05491b0a5490c596eda4dfec88d36.tar.gz
Refactor:core:Fix warnings, remove dead code.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5543 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xmlconfig.c')
-rw-r--r--navit/xmlconfig.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/navit/xmlconfig.c b/navit/xmlconfig.c
index a0b82a349..2d87c2bac 100644
--- a/navit/xmlconfig.c
+++ b/navit/xmlconfig.c
@@ -887,14 +887,7 @@ xpointer_test(const char *test, int len, struct xistate *elem)
static int
xpointer_element_match(const char *xpointer, int len, struct xistate *elem)
{
- int start,tlen,tlen2;
-#if 0
- char test2[len+1];
-
- strncpy(test2, xpointer, len);
- test2[len]='\0';
- dbg(0,"%s\n", test2);
-#endif
+ int start,tlen;
start=strcspn(xpointer, "[");
if (start > len)
start=len;
@@ -904,15 +897,14 @@ xpointer_element_match(const char *xpointer, int len, struct xistate *elem)
return 1;
if (xpointer[len-1] != ']')
return 0;
- tlen=len-start-2;
for (;;) {
start++;
- tlen2=strcspn(xpointer+start,"]");
- if (start + tlen2 > len)
+ tlen=strcspn(xpointer+start,"]");
+ if (start + tlen > len)
return 1;
- if (!xpointer_test(xpointer+start, tlen2, elem))
+ if (!xpointer_test(xpointer+start, tlen, elem))
return 0;
- start+=tlen2+1;
+ start+=tlen+1;
}
}