[yum-cvs] yum-metadata-parser xml-parser.c,1.13,1.14

[James Bowes]

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

Modified Files:
	xml-parser.c 
Log Message:
Use a common sax_characters function


Index: xml-parser.c
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/xml-parser.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xml-parser.c	3 Jun 2007 15:37:29 -0000	1.13
+++ xml-parser.c	3 Jun 2007 15:37:42 -0000	1.14
@@ -485,10 +485,9 @@
 }
 
 static void
-primary_sax_characters (void *data, const char *ch, int len)
+sax_characters (void *data, const char *ch, int len)
 {
-    PrimarySAXContext *ctx = (PrimarySAXContext *) data;
-    SAXContext *sctx = &ctx->sctx;
+    SAXContext *sctx = (SAXContext *) data;
 
     if (sctx->want_text)
         g_string_append_len (sctx->text_buffer, ch, len);
@@ -544,7 +543,7 @@
     (startElementSAXFunc) primary_sax_start_element, /* startElement */
     (endElementSAXFunc) primary_sax_end_element,     /* endElement */
     NULL,      /* reference */
-    (charactersSAXFunc) primary_sax_characters,      /* characters */
+    (charactersSAXFunc) sax_characters,      /* characters */
     NULL,      /* ignorableWhitespace */
     NULL,      /* processingInstruction */
     NULL,      /* comment */
@@ -768,16 +767,6 @@
 }
 
 static void
-filelist_sax_characters (void *data, const char *ch, int len)
-{
-    FilelistSAXContext *ctx = (FilelistSAXContext *) data;
-    SAXContext *sctx = &ctx->sctx;
-
-    if (sctx->want_text)
-        g_string_append_len (sctx->text_buffer, ch, len);
-}
-
-static void
 filelist_sax_error (void *data, const char *msg, ...)
 {
     FilelistSAXContext *ctx = (FilelistSAXContext *) data;
@@ -813,7 +802,7 @@
     (startElementSAXFunc) filelist_sax_start_element, /* startElement */
     (endElementSAXFunc) filelist_sax_end_element,     /* endElement */
     NULL,      /* reference */
-    (charactersSAXFunc) filelist_sax_characters,      /* characters */
+    (charactersSAXFunc) sax_characters,      /* characters */
     NULL,      /* ignorableWhitespace */
     NULL,      /* processingInstruction */
     NULL,      /* comment */
@@ -1023,16 +1012,6 @@
 }
 
 static void
-other_sax_characters (void *data, const char *ch, int len)
-{
-    OtherSAXContext *ctx = (OtherSAXContext *) data;
-    SAXContext *sctx = &ctx->sctx;
-
-    if (sctx->want_text)
-        g_string_append_len (sctx->text_buffer, ch, len);
-}
-
-static void
 other_sax_error (void *data, const char *msg, ...)
 {
     OtherSAXContext *ctx = (OtherSAXContext *) data;
@@ -1068,7 +1047,7 @@
     (startElementSAXFunc) other_sax_start_element, /* startElement */
     (endElementSAXFunc) other_sax_end_element,     /* endElement */
     NULL,      /* reference */
-    (charactersSAXFunc) other_sax_characters,      /* characters */
+    (charactersSAXFunc) sax_characters,      /* characters */
     NULL,      /* ignorableWhitespace */
     NULL,      /* processingInstruction */
     NULL,      /* comment */