- got rid of some fprintfs...

diff --git a/tools/repo_patchxml.c b/tools/repo_patchxml.c
index b7bc78055b5c8506cedb959c560a8d289367674a..f7fdb0ef600a0cd9ea9301e83a44bd58a55b9f66 100644 (file)
--- a/tools/repo_patchxml.c
+++ b/tools/repo_patchxml.c
@@ -754,7 +754,7 @@ repo_add_patchxml(Repo *repo, FILE *fp, int flags)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
-         fprintf(stderr, "repo_patchxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+         pool_debug(pool, SAT_FATAL, "repo_patchxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
          exit(1);
        }
       if (l == 0)

diff --git a/tools/repo_products.c b/tools/repo_products.c
index 726dce70a07bd72c7e291c8f732b9fbd41fe3733..def05bdb53fe6fd22bbb67cf449f0e3b1f811114 100644 (file)
--- a/tools/repo_products.c
+++ b/tools/repo_products.c
@@ -438,8 +438,9 @@ repo_add_product(struct parsedata *pd, FILE *fp, int code11)
          l = fread(buf, 1, sizeof(buf), fp);
          if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
            {
-             fprintf(stderr, "%s: %s at line %u:%u\n", pd->filename, XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
-             fprintf(stderr, "Skipping this product\n");
+             pool_debug(pd->pool, SAT_ERROR, "%s: %s at line %u:%u\n", pd->filename, XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+             pool_debug(pd->pool, SAT_ERROR, "Skipping this product\n");
+             XML_ParserFree(parser);
              return;
            }
          if (l == 0)
@@ -525,7 +526,6 @@ repo_add_product(struct parsedata *pd, FILE *fp, int code11)
            s->provides = repo_addid_dep(pd->repo, s->provides, rel2id(pd->pool, s->name, s->evr, REL_EQ, 1), 0);
        }
     }
-  return;
 }
 
 

diff --git a/tools/repo_repomdxml.c b/tools/repo_repomdxml.c
index 2bb4fb03bfde5122d5867e8e3f5e9884f923e699..3636364dfc67ed44a5b1944ed313e2508a035965 100644 (file)
--- a/tools/repo_repomdxml.c
+++ b/tools/repo_repomdxml.c
@@ -403,7 +403,7 @@ repo_add_repomdxml(Repo *repo, FILE *fp, int flags)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
-         fprintf(stderr, "repo_repomdxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+         pool_debug(pool, SAT_FATAL, "repo_repomdxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
          exit(1);
        }
       if (l == 0)

diff --git a/tools/repo_rpmmd.c b/tools/repo_rpmmd.c
index 49f873df50cd4d9126f517840b7877c2756a1978..c3433f5c37ca9aed9b1fd8a20367f9bdb3a259dd 100644 (file)
--- a/tools/repo_rpmmd.c
+++ b/tools/repo_rpmmd.c
@@ -1135,7 +1135,7 @@ repo_add_rpmmd(Repo *repo, FILE *fp, const char *language, int flags)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
-         fprintf(stderr, "repo_rpmmd: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+         pool_debug(pool, SAT_FATAL, "repo_rpmmd: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
          exit(1);
        }
       if (l == 0)

diff --git a/tools/repo_updateinfoxml.c b/tools/repo_updateinfoxml.c
index 81d9cffd77d22897da55d56bc78548dc96b822e3..5e4b1f8c5fb05ddb58bb35d63c29dd1dca405b5a 100644 (file)
--- a/tools/repo_updateinfoxml.c
+++ b/tools/repo_updateinfoxml.c
@@ -599,7 +599,7 @@ repo_add_updateinfoxml(Repo *repo, FILE *fp, int flags)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
-         fprintf(stderr, "repo_updateinfoxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+         pool_debug(pool, SAT_FATAL, "repo_updateinfoxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
          exit(1);
        }
       if (l == 0)

diff --git a/tools/repo_zyppdb.c b/tools/repo_zyppdb.c
index 0fa0c1d705511df37e3541820792198b64986883..dc94281402c876aa37092f24bcdc765d5cbb6bf4 100644 (file)
--- a/tools/repo_zyppdb.c
+++ b/tools/repo_zyppdb.c
@@ -317,14 +317,13 @@ repo_add_product(struct parsedata *pd, Repodata *data, FILE *fp)
       l = fread(buf, 1, sizeof(buf), fp);
       if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
        {
-         fprintf(stderr, "repo_zyppdb: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+         pool_debug(pd->pool, SAT_ERROR, "repo_zyppdb: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
          return;
        }
       if (l == 0)
        break;
     }
   XML_ParserFree(parser);
-  return;
 }