Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

delete unused static functions.

Browse source
This commit is contained in:
Enno Rehling 2018-04-28 17:52:48 +02:00
parent 03cff6d595
commit ff4bae4da1
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/exparse.c
View file

@ -54,16 +54,6 @@ static int xml_strcmp(const XML_Char *xs, const char *cs) {
return strcmp(xs, cs); return strcmp(xs, cs);
} }
static const char * attr_get(const XML_Char **attr, const char *key) {
int i;
for (i = 0; attr[i]; i += 2) {
if (xml_strcmp(attr[i], key) == 0) {
return (const char *)attr[i + 1];
}
}
return NULL;
}
static bool xml_bool(const XML_Char *val) { static bool xml_bool(const XML_Char *val) {
if (xml_strcmp(val, "yes") == 0) return true; if (xml_strcmp(val, "yes") == 0) return true;
if (xml_strcmp(val, "true") == 0) return true; if (xml_strcmp(val, "true") == 0) return true;
@ -75,13 +65,6 @@ static int xml_int(const XML_Char *val) {
return atoi((const char *)val); return atoi((const char *)val);
} }
static bool attr_bool(XML_Char **pair, const char *key) {
if (xml_strcmp(pair[0], key) == 0) {
return xml_bool(pair[1]);
}
return false;
}
static void handle_bad_input(userdata *ud, const XML_Char *el, const XML_Char *attr) { static void handle_bad_input(userdata *ud, const XML_Char *el, const XML_Char *attr) {
if (attr) { if (attr) {
log_error("unknown attribute in <%s>: %s", (const char *)el, (const char *)attr); log_error("unknown attribute in <%s>: %s", (const char *)el, (const char *)attr);
@ -125,7 +108,6 @@ static void handle_resource(userdata *ud, const XML_Char *el, const XML_Char **a
flags |= RTF_ITEM; flags |= RTF_ITEM;
} }
else if (xml_strcmp(attr[i], "material") == 0) { else if (xml_strcmp(attr[i], "material") == 0) {
/* TODO: appearance should be a property of item, not resource */
material = xml_bool(attr[i + 1]); material = xml_bool(attr[i + 1]);
} }
else if (!handle_flag(&flags, attr + i, flag_names)) { else if (!handle_flag(&flags, attr + i, flag_names)) {
@ -229,7 +211,7 @@ static void XMLCALL handle_resources(userdata *ud, const XML_Char *el, const XML
/* TODO */ /* TODO */
} }
else if (xml_strcmp(el, "luxury") == 0) { else if (xml_strcmp(el, "luxury") == 0) {
/* TODO */ rtype->ltype = new_luxurytype(itype, 0);
} }
else if (xml_strcmp(el, "potion") == 0) { else if (xml_strcmp(el, "potion") == 0) {
/* TODO */ /* TODO */
@ -291,6 +273,7 @@ static void XMLCALL handle_start(void *data, const XML_Char *el, const XML_Char
switch (ud->type) { switch (ud->type) {
case EXP_RESOURCES: case EXP_RESOURCES:
handle_resources(ud, el, attr); handle_resources(ud, el, attr);
break;
default: default:
/* not implemented */ /* not implemented */
handle_bad_input(ud, el, NULL); handle_bad_input(ud, el, NULL);
@ -328,7 +311,7 @@ static void XMLCALL handle_data(void *data, const XML_Char *xs, int len) {
int exparse_readfile(const char * filename) { int exparse_readfile(const char * filename) {
XML_Parser xp; XML_Parser xp;
FILE *F; FILE *F;
int err = 1; int err = 0;
char buf[4096]; char buf[4096];
userdata ud; userdata ud;