From: Tomas Mlcoch Date: Mon, 25 Feb 2013 10:46:14 +0000 (+0100) Subject: xml_dump(_.*)? module refactoring X-Git-Tag: upstream/0.2.1~263 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e74768f50dcf3ef37767ee69003f8b4add7752e;p=services%2Fcreaterepo_c.git xml_dump(_.*)? module refactoring --- diff --git a/src/createrepo_c.c b/src/createrepo_c.c index 94b28f9..0841cb8 100644 --- a/src/createrepo_c.c +++ b/src/createrepo_c.c @@ -921,7 +921,7 @@ main(int argc, char **argv) // Init package parser cr_package_parser_init(); - cr_dumper_init(); + cr_xml_dump_init(); // Thread pool - User data initialization @@ -982,7 +982,7 @@ main(int argc, char **argv) g_thread_pool_free(pool, FALSE, TRUE); g_message("Pool finished"); - cr_dumper_cleanup(); + cr_xml_dump_cleanup(); cr_puts(user_data.pri_f, ""); cr_puts(user_data.fil_f, ""); diff --git a/src/xml_dump.c b/src/xml_dump.c index 9717d56..16148d1 100644 --- a/src/xml_dump.c +++ b/src/xml_dump.c @@ -27,26 +27,23 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#undef MODULE -#define MODULE "xml_dump: " - void -cr_dumper_init() +cr_xml_dump_init() { xmlInitParser(); } void -cr_dumper_cleanup() +cr_xml_dump_cleanup() { xmlCleanupParser(); } void -cr_dump_files(xmlNodePtr node, cr_Package *package, int primary) +cr_xml_dump_files(xmlNodePtr node, cr_Package *package, int primary) { if (!node || !package->files) { return; @@ -102,7 +99,6 @@ cr_dump_files(xmlNodePtr node, cr_Package *package, int primary) } - struct cr_XmlStruct cr_xml_dump(cr_Package *pkg) { diff --git a/src/xml_dump.h b/src/xml_dump.h index 4e8de11..fa6fa4b 100644 --- a/src/xml_dump.h +++ b/src/xml_dump.h @@ -27,9 +27,10 @@ extern "C" { #include "package.h" /** \defgroup xml_dump XML dump API. + * \addtogroup xml_dump + * @{ */ -/**@{*/ /** Default namespace for primary.xml */ #define CR_XML_COMMON_NS "http://linux.duke.edu/metadata/common" /** Default namespace for filelists.xml */ @@ -38,11 +39,9 @@ extern "C" { #define CR_XML_OTHER_NS "http://linux.duke.edu/metadata/other" /** Namespace used in primary.xml */ #define CR_XML_RPM_NS "http://linux.duke.edu/metadata/rpm" -/**@}*/ -/** \ingroup xml_dump - * Xml chunks for primary.xml, filelists.xml and other.xml. +/** Xml chunks for primary.xml, filelists.xml and other.xml. */ struct cr_XmlStruct { char *primary; /*!< XML chunk for primary.xml */ @@ -50,44 +49,40 @@ struct cr_XmlStruct { char *other; /*!< XML chunk for other.xml */ }; -/** \ingroup xml_dump - * Initialize dumping part of library (Initialize libxml2). +/** Initialize dumping part of library (Initialize libxml2). */ -void cr_dumper_init(); +void cr_xml_dump_init(); -/** \ingroup xml_dump - * Cleanup initialized dumping part of library +/** Cleanup initialized dumping part of library */ -void cr_dumper_cleanup(); +void cr_xml_dump_cleanup(); -/** \ingroup xml_dump - * Generate primary xml chunk from cr_Package. +/** Generate primary xml chunk from cr_Package. * @param package cr_Package * @return xml chunk string or NULL on error */ char *cr_xml_dump_primary(cr_Package *package); -/** \ingroup xml_dump - * Generate filelists xml chunk from cr_Package. +/** Generate filelists xml chunk from cr_Package. * @param package cr_Package * @return xml chunk string or NULL on error */ char *cr_xml_dump_filelists(cr_Package *package); -/** \ingroup xml_dump - * Generate other xml chunk from cr_Package. +/** Generate other xml chunk from cr_Package. * @param package cr_Package * @return xml chunk string or NULL on error */ char *cr_xml_dump_other(cr_Package *package); -/** \ingroup xml_dump - * Generate all three xml chunks (primary, filelists, other) from cr_Package. +/** Generate all three xml chunks (primary, filelists, other) from cr_Package. * @param package cr_Package * @return cr_XmlStruct */ struct cr_XmlStruct cr_xml_dump(cr_Package *package); +/** @} */ + #ifdef __cplusplus } #endif diff --git a/src/xml_dump_filelists.c b/src/xml_dump_filelists.c index 86322a4..ef89aa7 100644 --- a/src/xml_dump_filelists.c +++ b/src/xml_dump_filelists.c @@ -28,15 +28,12 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#undef MODULE -#define MODULE "xml_dump_filelists: " - #define FORMAT_XML 1 #define FORMAT_LEVEL 0 void -dump_filelists_items(xmlNodePtr root, cr_Package *package) +cr_xml_dump_filelists_items(xmlNodePtr root, cr_Package *package) { /*********************************** Element: package @@ -79,7 +76,7 @@ dump_filelists_items(xmlNodePtr root, cr_Package *package) // Files dump - cr_dump_files(root, package, 0); + cr_xml_dump_files(root, package, 0); } @@ -95,12 +92,12 @@ cr_xml_dump_filelists(cr_Package *package) // Dump IT! - dump_filelists_items(root, package); + cr_xml_dump_filelists_items(root, package); char *result; xmlBufferPtr buf = xmlBufferCreate(); if (buf == NULL) { - g_critical(MODULE"%s: Error creating the xml buffer", __func__); + g_critical("%s: Error creating the xml buffer", __func__); return NULL; } // Seems to be little bit faster than xmlDocDumpFormatMemory diff --git a/src/xml_dump_internal.h b/src/xml_dump_internal.h index 068b354..c0dd40c 100644 --- a/src/xml_dump_internal.h +++ b/src/xml_dump_internal.h @@ -33,7 +33,7 @@ extern "C" { * @param primary process only primary files (see cr_is_primary() function * in the misc module) */ -void cr_dump_files(xmlNodePtr node, cr_Package *package, int primary); +void cr_xml_dump_files(xmlNodePtr node, cr_Package *package, int primary); #ifdef __cplusplus } diff --git a/src/xml_dump_other.c b/src/xml_dump_other.c index 65b5546..a73bb81 100644 --- a/src/xml_dump_other.c +++ b/src/xml_dump_other.c @@ -27,9 +27,6 @@ #include "package.h" #include "xml_dump.h" -#undef MODULE -#define MODULE "xml_dump_other: " - #define FORMAT_XML 1 #define FORMAT_LEVEL 0 @@ -37,7 +34,7 @@ void -dump_changelog(xmlNodePtr root, cr_Package *package) +cr_xml_dump_other_changelog(xmlNodePtr root, cr_Package *package) { if (!package->changelogs) { return; @@ -77,7 +74,7 @@ dump_changelog(xmlNodePtr root, cr_Package *package) void -dump_other_items(xmlNodePtr root, cr_Package *package) +cr_xml_dump_other_items(xmlNodePtr root, cr_Package *package) { /*********************************** Element: package @@ -120,7 +117,7 @@ dump_other_items(xmlNodePtr root, cr_Package *package) // Changelog dump - dump_changelog(root, package); + cr_xml_dump_other_changelog(root, package); } @@ -136,12 +133,12 @@ cr_xml_dump_other(cr_Package *package) // Dump IT! - dump_other_items(root, package); + cr_xml_dump_other_items(root, package); char *result; xmlBufferPtr buf = xmlBufferCreate(); if (buf == NULL) { - g_critical(MODULE"%s: Error creating the xml buffer", __func__); + g_critical("%s: Error creating the xml buffer", __func__); return NULL; } // Seems to be little bit faster than xmlDocDumpFormatMemory diff --git a/src/xml_dump_primary.c b/src/xml_dump_primary.c index 599d69f..b141526 100644 --- a/src/xml_dump_primary.c +++ b/src/xml_dump_primary.c @@ -28,9 +28,6 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#undef MODULE -#define MODULE "xml_dump_primary: " - #define PROVIDES 0 #define CONFLICTS 1 #define OBSOLETES 2 @@ -44,7 +41,7 @@ void -dump_pco(xmlNodePtr root, cr_Package *package, int pcotype) +cr_xml_dump_primary_dump_pco(xmlNodePtr root, cr_Package *package, int pcotype) { const char *elem_name; GSList *files = NULL; @@ -130,7 +127,7 @@ dump_pco(xmlNodePtr root, cr_Package *package, int pcotype) void -dump_base_items(xmlNodePtr root, cr_Package *package) +cr_xml_dump_primary_base_items(xmlNodePtr root, cr_Package *package) { /*********************************** Element: package @@ -366,11 +363,11 @@ dump_base_items(xmlNodePtr root, cr_Package *package) // Files dump - dump_pco(format, package, PROVIDES); - dump_pco(format, package, REQUIRES); - dump_pco(format, package, CONFLICTS); - dump_pco(format, package, OBSOLETES); - cr_dump_files(format, package, 1); + cr_xml_dump_primary_dump_pco(format, package, PROVIDES); + cr_xml_dump_primary_dump_pco(format, package, REQUIRES); + cr_xml_dump_primary_dump_pco(format, package, CONFLICTS); + cr_xml_dump_primary_dump_pco(format, package, OBSOLETES); + cr_xml_dump_files(format, package, 1); } @@ -387,12 +384,12 @@ cr_xml_dump_primary(cr_Package *package) // Dump IT! - dump_base_items(root, package); + cr_xml_dump_primary_base_items(root, package); char *result; xmlBufferPtr buf = xmlBufferCreate(); if (buf == NULL) { - g_critical(MODULE"%s: Error creating the xml buffer", __func__); + g_critical("%s: Error creating the xml buffer", __func__); return NULL; } // Seems to be little bit faster than xmlDocDumpFormatMemory