[Yum-devel] [PATCH 1/6] Use a common sax warning callback for the three file types.

James Bowes jbowes at redhat.com
Wed May 30 01:23:26 UTC 2007


---
 xml-parser.c |   38 ++++----------------------------------
 1 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/xml-parser.c b/xml-parser.c
index a968a0c..45985dd 100644
--- a/xml-parser.c
+++ b/xml-parser.c
@@ -472,7 +472,7 @@ primary_sax_characters (void *data, const char *ch, int len)
 }
 
 static void
-primary_sax_warning (void *data, const char *msg, ...)
+sax_warning (void *data, const char *msg, ...)
 {
     va_list args;
     char *tmp;
@@ -525,7 +525,7 @@ static xmlSAXHandler primary_sax_handler = {
     NULL,      /* ignorableWhitespace */
     NULL,      /* processingInstruction */
     NULL,      /* comment */
-    primary_sax_warning,      /* warning */
+    sax_warning,      /* warning */
     primary_sax_error,      /* error */
     primary_sax_error,      /* fatalError */
 };
@@ -752,21 +752,6 @@ filelist_sax_characters (void *data, const char *ch, int len)
 }
 
 static void
-filelist_sax_warning (void *data, const char *msg, ...)
-{
-    va_list args;
-    char *tmp;
-
-    va_start (args, msg);
-
-    tmp = g_strdup_vprintf (msg, args);
-    g_warning ("* SAX Warning: %s", tmp);
-    g_free (tmp);
-
-    va_end (args);
-}
-
-static void
 filelist_sax_error (void *data, const char *msg, ...)
 {
     FilelistSAXContext *ctx = (FilelistSAXContext *) data;
@@ -805,7 +790,7 @@ static xmlSAXHandler filelist_sax_handler = {
     NULL,      /* ignorableWhitespace */
     NULL,      /* processingInstruction */
     NULL,      /* comment */
-    filelist_sax_warning,      /* warning */
+    sax_warning,      /* warning */
     filelist_sax_error,      /* error */
     filelist_sax_error,      /* fatalError */
 };
@@ -1017,21 +1002,6 @@ other_sax_characters (void *data, const char *ch, int len)
 }
 
 static void
-other_sax_warning (void *data, const char *msg, ...)
-{
-    va_list args;
-    char *tmp;
-
-    va_start (args, msg);
-
-    tmp = g_strdup_vprintf (msg, args);
-    g_warning ("* SAX Warning: %s", tmp);
-    g_free (tmp);
-
-    va_end (args);
-}
-
-static void
 other_sax_error (void *data, const char *msg, ...)
 {
     OtherSAXContext *ctx = (OtherSAXContext *) data;
@@ -1070,7 +1040,7 @@ static xmlSAXHandler other_sax_handler = {
     NULL,      /* ignorableWhitespace */
     NULL,      /* processingInstruction */
     NULL,      /* comment */
-    other_sax_warning,      /* warning */
+    sax_warning,      /* warning */
     other_sax_error,      /* error */
     other_sax_error,      /* fatalError */
 };
-- 
1.5.2.869.g6b3ba

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.baseurl.org/pipermail/yum-devel/attachments/20070529/208f6356/attachment.pgp 


More information about the Yum-devel mailing list