From 8ac98c5ed5ed8abb0512ed1ebb2c72c4b4477896 Mon Sep 17 00:00:00 2001 From: Tomas Mlcoch Date: Tue, 10 Jan 2012 16:06:34 +0100 Subject: [PATCH] XmlStruct moved into xml_dump.h --- parsehdr.c | 2 ++ parsehdr.h | 8 +------- xml_dump.h | 7 +++++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/parsehdr.c b/parsehdr.c index 0e0c46e..e4ca0ad 100644 --- a/parsehdr.c +++ b/parsehdr.c @@ -295,6 +295,8 @@ Package *parse_header(Header hdr, gint64 mtime, gint64 size, const char *checksu return pkg; } + + struct XmlStruct xml_from_header(Header hdr, gint64 mtime, gint64 size, const char *checksum, const char *checksum_type, const char *location_href, const char *location_base, int changelog_limit, gint64 hdr_start, gint64 hdr_end) diff --git a/parsehdr.h b/parsehdr.h index 22a2b3f..f7940fc 100644 --- a/parsehdr.h +++ b/parsehdr.h @@ -4,13 +4,7 @@ #include #include #include "package.h" - -struct XmlStruct{ - char *primary; - char *filelists; - char *other; -}; - +#include "xml_dump.h" Package *parse_header(Header hdr, gint64 mtime, gint64 size, const char *checksum, const char *checksum_type, const char *location_href, const char *location_base, diff --git a/xml_dump.h b/xml_dump.h index ceeab61..f5e03d9 100644 --- a/xml_dump.h +++ b/xml_dump.h @@ -5,6 +5,12 @@ #include #include "package.h" +struct XmlStruct{ + char *primary; + char *filelists; + char *other; +}; + /** * ConvertInput: * @in: string in a given encoding @@ -21,5 +27,6 @@ void dump_files(xmlTextWriterPtr, Package *, int, xmlCharEncodingHandlerPtr); char *xml_dump_primary(Package *, const char *); char *xml_dump_filelists(Package *, const char *); char *xml_dump_other(Package *, const char *); +//struct XmlStruct xml_dump_all(Package *, const char *); #endif /* __XML_DUMP__ */ -- 2.7.4