[yum-cvs] yum-metadata-parser xml-parser.c,1.11,1.12
James Bowes
jbowes at linux.duke.edu
Sun Jun 3 15:37:20 UTC 2007
Update of /home/groups/yum/cvs/yum-metadata-parser
In directory login1.linux.duke.edu:/tmp/cvs-serv1308
Modified Files:
xml-parser.c
Log Message:
Use SAXContext for filelists
Index: xml-parser.c
===================================================================
RCS file: /home/groups/yum/cvs/yum-metadata-parser/xml-parser.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xml-parser.c 3 Jun 2007 15:37:04 -0000 1.11
+++ xml-parser.c 3 Jun 2007 15:37:18 -0000 1.12
@@ -615,18 +615,11 @@
} FilelistSAXContextState;
typedef struct {
- xmlParserCtxt *xml_context;
+ SAXContext sctx;
+
FilelistSAXContextState state;
- GError **error;
- CountFn count_fn;
- PackageFn package_fn;
- gpointer user_data;
- Package *current_package;
PackageFile *current_file;
-
- gboolean want_text;
- GString *text_buffer;
} FilelistSAXContext;
static void
@@ -634,16 +627,18 @@
const char *name,
const char **attrs)
{
+ SAXContext *sctx = &ctx->sctx;
+
if (!strcmp (name, "package")) {
- g_assert (ctx->current_package == NULL);
+ g_assert (sctx->current_package == NULL);
ctx->state = FILELIST_PARSER_PACKAGE;
- ctx->current_package = package_new ();
- parse_package (attrs, ctx->current_package);
+ sctx->current_package = package_new ();
+ parse_package (attrs, sctx->current_package);
}
- else if (ctx->count_fn && !strcmp (name, "filelists")) {
+ else if (sctx->count_fn && !strcmp (name, "filelists")) {
int i;
const char *attr;
const char *value;
@@ -653,8 +648,8 @@
value = attrs[++i];
if (!strcmp (attr, "packages")) {
- ctx->count_fn (string_to_guint32_with_default (value, 0),
- ctx->user_data);
+ sctx->count_fn (string_to_guint32_with_default (value, 0),
+ sctx->user_data);
break;
}
}
@@ -666,14 +661,16 @@
const char *name,
const char **attrs)
{
- Package *p = ctx->current_package;
+ SAXContext *sctx = &ctx->sctx;
+
+ Package *p = sctx->current_package;
int i;
const char *attr;
const char *value;
g_assert (p != NULL);
- ctx->want_text = TRUE;
+ sctx->want_text = TRUE;
if (!strcmp (name, "version")) {
parse_version_info(attrs, p);
@@ -697,9 +694,10 @@
filelist_sax_start_element (void *data, const char *name, const char **attrs)
{
FilelistSAXContext *ctx = (FilelistSAXContext *) data;
+ SAXContext *sctx = &ctx->sctx;
- if (ctx->text_buffer->len)
- g_string_truncate (ctx->text_buffer, 0);
+ if (sctx->text_buffer->len)
+ g_string_truncate (sctx->text_buffer, 0);
switch (ctx->state) {
case FILELIST_PARSER_TOPLEVEL:
@@ -716,18 +714,20 @@
static void
filelist_parser_package_end (FilelistSAXContext *ctx, const char *name)
{
- Package *p = ctx->current_package;
+ SAXContext *sctx = &ctx->sctx;
+
+ Package *p = sctx->current_package;
g_assert (p != NULL);
- ctx->want_text = FALSE;
+ sctx->want_text = FALSE;
if (!strcmp (name, "package")) {
- if (ctx->package_fn && !*ctx->error)
- ctx->package_fn (p, ctx->user_data);
+ if (sctx->package_fn && !*sctx->error)
+ sctx->package_fn (p, sctx->user_data);
package_free (p);
- ctx->current_package = NULL;
+ sctx->current_package = NULL;
if (ctx->current_file) {
g_free (ctx->current_file);
@@ -740,8 +740,8 @@
else if (!strcmp (name, "file")) {
PackageFile *file = ctx->current_file;
file->name = g_string_chunk_insert_len (p->chunk,
- ctx->text_buffer->str,
- ctx->text_buffer->len);
+ sctx->text_buffer->str,
+ sctx->text_buffer->len);
if (!file->type)
file->type = g_string_chunk_insert_const (p->chunk, "file");
@@ -754,6 +754,7 @@
filelist_sax_end_element (void *data, const char *name)
{
FilelistSAXContext *ctx = (FilelistSAXContext *) data;
+ SAXContext *sctx = &ctx->sctx;
switch (ctx->state) {
case FILELIST_PARSER_PACKAGE:
@@ -763,29 +764,31 @@
break;
}
- g_string_truncate (ctx->text_buffer, 0);
+ g_string_truncate (sctx->text_buffer, 0);
}
static void
filelist_sax_characters (void *data, const char *ch, int len)
{
FilelistSAXContext *ctx = (FilelistSAXContext *) data;
+ SAXContext *sctx = &ctx->sctx;
- if (ctx->want_text)
- g_string_append_len (ctx->text_buffer, ch, len);
+ 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;
+ SAXContext *sctx = &ctx->sctx;
va_list args;
char *tmp;
va_start (args, msg);
tmp = g_strdup_vprintf (msg, args);
- g_set_error (ctx->error, YUM_PARSER_ERROR, YUM_PARSER_ERROR,
+ g_set_error (sctx->error, YUM_PARSER_ERROR, YUM_PARSER_ERROR,
"Parsing filelists.xml error: %s", tmp);
g_free (tmp);
@@ -827,30 +830,32 @@
GError **err)
{
FilelistSAXContext ctx;
+ SAXContext sctx = ctx.sctx;
+
int rc;
ctx.state = FILELIST_PARSER_TOPLEVEL;
- ctx.error = err;
- ctx.count_fn = count_callback;
- ctx.package_fn = package_callback;
- ctx.user_data = user_data;
- ctx.current_package = NULL;
+ sctx.error = err;
+ sctx.count_fn = count_callback;
+ sctx.package_fn = package_callback;
+ sctx.user_data = user_data;
+ sctx.current_package = NULL;
ctx.current_file = NULL;
- ctx.want_text = FALSE;
- ctx.text_buffer = g_string_sized_new (PACKAGE_FIELD_SIZE);
+ sctx.want_text = FALSE;
+ sctx.text_buffer = g_string_sized_new (PACKAGE_FIELD_SIZE);
xmlSubstituteEntitiesDefault (1);
rc = xmlSAXUserParseFile (&filelist_sax_handler, &ctx, filename);
- if (ctx.current_package) {
+ if (sctx.current_package) {
g_warning ("Incomplete package lost");
- package_free (ctx.current_package);
+ package_free (sctx.current_package);
}
if (ctx.current_file)
g_free (ctx.current_file);
- g_string_free (ctx.text_buffer, TRUE);
+ g_string_free (sctx.text_buffer, TRUE);
}
/*****************************************************************************/
More information about the Yum-cvs-commits
mailing list