[yum-cvs] yum-metadata-parser xml-parser.c,1.9,1.10

[James Bowes]

Update of /home/groups/yum/cvs/yum-metadata-parser
In directory login1.linux.duke.edu:/tmp/cvs-serv1273

Modified Files:
	xml-parser.c 
Log Message:
Use a common sax warning callback for the three file types.


Index: xml-parser.c
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/xml-parser.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xml-parser.c	30 May 2007 01:02:33 -0000	1.9
+++ xml-parser.c	3 Jun 2007 15:36:24 -0000	1.10
@@ -472,7 +472,7 @@
 }
 
 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 @@
     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 @@
 }
 
 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 @@
     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 @@
 }
 
 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 @@
     NULL,      /* ignorableWhitespace */
     NULL,      /* processingInstruction */
     NULL,      /* comment */
-    other_sax_warning,      /* warning */
+    sax_warning,      /* warning */
     other_sax_error,      /* error */
     other_sax_error,      /* fatalError */
 };