Mailinglist Archive: zypp-commit (266 mails)

< Previous Next >
[zypp-commit] r11621 - in /trunk/sat-solver/tools: repo_patchxml.c repo_products.c repo_repomdxml.c repo_rpmmd.c repo_updateinfoxml.c repo_zyppdb.c
  • From: mlschroe@xxxxxxxxxxxxxxxx
  • Date: Fri, 07 Nov 2008 11:36:42 -0000
  • Message-id: <20081107113643.247A633A07@xxxxxxxxxxxxxxxx>
Author: mlschroe
Date: Fri Nov 7 12:36:41 2008
New Revision: 11621

URL: http://svn.opensuse.org/viewcvs/zypp?rev=11621&view=rev
Log:
- got rid of some fprintfs...

Modified:
trunk/sat-solver/tools/repo_patchxml.c
trunk/sat-solver/tools/repo_products.c
trunk/sat-solver/tools/repo_repomdxml.c
trunk/sat-solver/tools/repo_rpmmd.c
trunk/sat-solver/tools/repo_updateinfoxml.c
trunk/sat-solver/tools/repo_zyppdb.c

Modified: trunk/sat-solver/tools/repo_patchxml.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_patchxml.c?rev=11621&r1=11620&r2=11621&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_patchxml.c (original)
+++ trunk/sat-solver/tools/repo_patchxml.c Fri Nov 7 12:36:41 2008
@@ -754,7 +754,7 @@
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)

Modified: trunk/sat-solver/tools/repo_products.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.c?rev=11621&r1=11620&r2=11621&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_products.c (original)
+++ trunk/sat-solver/tools/repo_products.c Fri Nov 7 12:36:41 2008
@@ -438,8 +438,9 @@
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 @@
s->provides = repo_addid_dep(pd->repo, s->provides,
rel2id(pd->pool, s->name, s->evr, REL_EQ, 1), 0);
}
}
- return;
}



Modified: trunk/sat-solver/tools/repo_repomdxml.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_repomdxml.c?rev=11621&r1=11620&r2=11621&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_repomdxml.c (original)
+++ trunk/sat-solver/tools/repo_repomdxml.c Fri Nov 7 12:36:41 2008
@@ -403,7 +403,7 @@
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)

Modified: trunk/sat-solver/tools/repo_rpmmd.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?rev=11621&r1=11620&r2=11621&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_rpmmd.c (original)
+++ trunk/sat-solver/tools/repo_rpmmd.c Fri Nov 7 12:36:41 2008
@@ -1135,7 +1135,7 @@
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)

Modified: trunk/sat-solver/tools/repo_updateinfoxml.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_updateinfoxml.c?rev=11621&r1=11620&r2=11621&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_updateinfoxml.c (original)
+++ trunk/sat-solver/tools/repo_updateinfoxml.c Fri Nov 7 12:36:41 2008
@@ -599,7 +599,7 @@
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)

Modified: trunk/sat-solver/tools/repo_zyppdb.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_zyppdb.c?rev=11621&r1=11620&r2=11621&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_zyppdb.c (original)
+++ trunk/sat-solver/tools/repo_zyppdb.c Fri Nov 7 12:36:41 2008
@@ -317,14 +317,13 @@
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;
}



--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages