X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ext%2Frepo_rpmmd.c;h=9bb50a05a484e451050be023a01c1d2b5cb1d25e;hb=79b3a6b7ab494c5ff10e740fd147f21a04907907;hp=9f49bd31572f7fb61c167d5befa2879bb0e6c924;hpb=26781f8c44b4495fba2d0f4a39fe6379b08f32ce;p=platform%2Fupstream%2Flibsolv.git diff --git a/ext/repo_rpmmd.c b/ext/repo_rpmmd.c index 9f49bd3..9bb50a0 100644 --- a/ext/repo_rpmmd.c +++ b/ext/repo_rpmmd.c @@ -1091,13 +1091,6 @@ endElement(struct solv_xmlparser *xmlp, int state, char *content) } } -static void -errorCallback(struct solv_xmlparser *xmlp, const char *errstr, unsigned int line, unsigned int column) -{ - struct parsedata *pd = xmlp->userdata; - pd->ret = pool_error(pd->pool, -1, "repo_rpmmd: %s at line %u:%u", errstr, line, column); -} - /*-----------------------------------------------*/ @@ -1135,8 +1128,9 @@ repo_add_rpmmd(Repo *repo, FILE *fp, const char *language, int flags) fill_cshash_from_repo(&pd); } - solv_xmlparser_init(&pd.xmlp, stateswitches, &pd, startElement, endElement, errorCallback); - solv_xmlparser_parse(&pd.xmlp, fp); + solv_xmlparser_init(&pd.xmlp, stateswitches, &pd, startElement, endElement); + if (solv_xmlparser_parse(&pd.xmlp, fp) != SOLV_XMLPARSER_OK) + pd.ret = pool_error(pool, -1, "repo_rpmmd: %s at line %u:%u", pd.xmlp.errstr, pd.xmlp.line, pd.xmlp.column); solv_xmlparser_free(&pd.xmlp); solv_free(pd.lastdirstr);