X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ext%2Fsolv_xmlparser.h;h=ced0571f7d610722ad308d2adeb7ac46529082a8;hb=79b3a6b7ab494c5ff10e740fd147f21a04907907;hp=9fb342f42b687ea809f116efa2a2be5ee96ad4f5;hpb=26781f8c44b4495fba2d0f4a39fe6379b08f32ce;p=platform%2Fupstream%2Flibsolv.git diff --git a/ext/solv_xmlparser.h b/ext/solv_xmlparser.h index 9fb342f..ced0571 100644 --- a/ext/solv_xmlparser.h +++ b/ext/solv_xmlparser.h @@ -8,6 +8,9 @@ struct solv_xmlparser_element { struct solv_xmlparser { void *userdata; + char *errstr; + unsigned int line; + unsigned int column; int state; int docontent; @@ -24,12 +27,14 @@ struct solv_xmlparser { void (*startelement)(struct solv_xmlparser *xmlp, int state, const char *name, const char **atts); void (*endelement)(struct solv_xmlparser *xmlp, int state, char *content); - void (*errorhandler)(struct solv_xmlparser *xmlp, const char *errstr, unsigned int line, unsigned int column); Id *elementhelper; void *parser; }; +#define SOLV_XMLPARSER_OK 0 +#define SOLV_XMLPARSER_ERROR -1 + static inline const char * solv_xmlparser_find_attr(const char *txt, const char **atts) { @@ -41,11 +46,10 @@ solv_xmlparser_find_attr(const char *txt, const char **atts) extern void solv_xmlparser_init(struct solv_xmlparser *xmlp, struct solv_xmlparser_element *elements, void *userdata, void (*startelement)(struct solv_xmlparser *xmlp, int state, const char *name, const char **atts), - void (*endelement)(struct solv_xmlparser *xmlp, int state, char *content), - void (*errorhandler)(struct solv_xmlparser *xmlp, const char *errstr, unsigned int line, unsigned int column)); + void (*endelement)(struct solv_xmlparser *xmlp, int state, char *content)); extern void solv_xmlparser_free(struct solv_xmlparser *xmlp); -extern void solv_xmlparser_parse(struct solv_xmlparser *xmlp, FILE *fp); +extern int solv_xmlparser_parse(struct solv_xmlparser *xmlp, FILE *fp); unsigned int solv_xmlparser_lineno(struct solv_xmlparser *xmlp); char *solv_xmlparser_contentspace(struct solv_xmlparser *xmlp, int l);