From: Tomas Mlcoch Date: Mon, 30 Mar 2015 13:49:36 +0000 (+0200) Subject: Use only one error domain: CREATEREPO_C_ERROR X-Git-Tag: upstream/0.10.0~115 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16142ec67b2f2ed05e88343151b3deddd506b4f9;p=services%2Fcreaterepo_c.git Use only one error domain: CREATEREPO_C_ERROR --- diff --git a/src/checksum.c b/src/checksum.c index 7bd47fb..e5c655d 100644 --- a/src/checksum.c +++ b/src/checksum.c @@ -27,7 +27,7 @@ #include "error.h" #include "checksum.h" -#define ERR_DOMAIN CR_CHECKSUM_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define MAX_CHECKSUM_NAME_LEN 7 #define BUFFER_SIZE 2048 diff --git a/src/cmd_parser.c b/src/cmd_parser.c index cf968af..3d555c0 100644 --- a/src/cmd_parser.c +++ b/src/cmd_parser.c @@ -29,7 +29,7 @@ #include "misc.h" -#define ERR_DOMAIN CR_CMD_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define DEFAULT_CHANGELOG_LIMIT 10 #define DEFAULT_CHECKSUM "sha256" #define DEFAULT_WORKERS 5 diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c index 905fce6..211b2a2 100644 --- a/src/compression_wrapper.c +++ b/src/compression_wrapper.c @@ -33,15 +33,15 @@ #include "compression_wrapper.h" -#define ERR_DOMAIN CR_COMPRESSION_WRAPPER_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR /* -#define Z_CR_CW_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) +#define Z_CR_CW_NO_COMPRESSION 0 +#define Z_BEST_SPEED 1 +#define Z_BEST_COMPRESSION 9 +#define Z_DEFAULT_COMPRESSION (-1) */ -#define CR_CW_GZ_COMPRESSION_LEVEL Z_DEFAULT_COMPRESSION +#define CR_CW_GZ_COMPRESSION_LEVEL Z_DEFAULT_COMPRESSION /* #define Z_FILTERED 1 diff --git a/src/deltarpms.c b/src/deltarpms.c index 8f4782f..d7dcd91 100644 --- a/src/deltarpms.c +++ b/src/deltarpms.c @@ -36,7 +36,7 @@ #include "error.h" -#define ERR_DOMAIN CR_DELTARPMS_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define MAKEDELTARPM "/usr/bin/makedeltarpm" diff --git a/src/helpers.c b/src/helpers.c index 43330a1..ec0b59b 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -33,7 +33,7 @@ #include "xml_dump.h" #include "locate_metadata.h" -#define ERR_DOMAIN CR_HELPER_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR typedef struct _old_file { time_t mtime; diff --git a/src/load_metadata.c b/src/load_metadata.c index c760795..0842d22 100644 --- a/src/load_metadata.c +++ b/src/load_metadata.c @@ -30,7 +30,7 @@ #include "locate_metadata.h" #include "xml_parser.h" -#define ERR_DOMAIN CR_LOAD_METADATA_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define STRINGCHUNK_SIZE 16384 /** Structure for loaded metadata diff --git a/src/locate_metadata.c b/src/locate_metadata.c index e72d8c1..9b8a4c3 100644 --- a/src/locate_metadata.c +++ b/src/locate_metadata.c @@ -31,7 +31,7 @@ #include "xml_parser.h" #include "cleanup.h" -#define ERR_DOMAIN CR_LOCATE_METADATA_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define TMPDIR_PATTERN "createrepo_c_tmp_repo_XXXXXX" diff --git a/src/misc.c b/src/misc.c index 70f4f1c..31cb2a8 100644 --- a/src/misc.c +++ b/src/misc.c @@ -36,7 +36,7 @@ #include "error.h" #include "misc.h" -#define ERR_DOMAIN CR_MISC_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define BUFFER_SIZE 4096 diff --git a/src/modifyrepo_c.c b/src/modifyrepo_c.c index 68cc8df..bedd18a 100644 --- a/src/modifyrepo_c.c +++ b/src/modifyrepo_c.c @@ -37,7 +37,7 @@ #include "xml_file.h" #include "modifyrepo_shared.h" -#define ERR_DOMAIN CR_MODIFYREPO_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR typedef struct { diff --git a/src/modifyrepo_shared.c b/src/modifyrepo_shared.c index f9b1f18..d5bc2a1 100644 --- a/src/modifyrepo_shared.c +++ b/src/modifyrepo_shared.c @@ -29,7 +29,7 @@ #include "threads.h" #include "xml_dump.h" -#define ERR_DOMAIN CR_MODIFYREPO_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define DEFAULT_COMPRESSION CR_CW_GZ_COMPRESSION #define DEFAULT_CHECKSUM CR_CHECKSUM_SHA256 diff --git a/src/parsepkg.c b/src/parsepkg.c index a2bc52c..7abf04f 100644 --- a/src/parsepkg.c +++ b/src/parsepkg.c @@ -35,7 +35,7 @@ #include "misc.h" #include "checksum.h" -#define ERR_DOMAIN CR_PARSEPKG_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR rpmts cr_ts = NULL; diff --git a/src/python/typeconversion.c b/src/python/typeconversion.c index 898df27..0c58c1f 100644 --- a/src/python/typeconversion.c +++ b/src/python/typeconversion.c @@ -23,7 +23,7 @@ #include "src/createrepo_c.h" #include "src/repomd_internal.h" -#define ERR_DOMAIN CR_XML_PARSER_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR void diff --git a/src/repomd.c b/src/repomd.c index 9eb8dc0..31f9d70 100644 --- a/src/repomd.c +++ b/src/repomd.c @@ -33,7 +33,7 @@ #include "repomd_internal.h" #include "compression_wrapper.h" -#define ERR_DOMAIN CR_REPOMD_RECORD_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define LOCATION_HREF_PREFIX "repodata/" #define DEFAULT_DATABASE_VERSION 10 #define BUFFER_SIZE 8192 diff --git a/src/sqlite.c b/src/sqlite.c index 1046b0f..8fab344 100644 --- a/src/sqlite.c +++ b/src/sqlite.c @@ -33,7 +33,7 @@ #include "error.h" #include "xml_dump.h" -#define ERR_DOMAIN CR_DB_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define ENCODED_PACKAGE_FILE_FILES 2048 #define ENCODED_PACKAGE_FILE_TYPES 60 diff --git a/src/threads.c b/src/threads.c index 2f43c1b..5dd316b 100644 --- a/src/threads.c +++ b/src/threads.c @@ -22,7 +22,7 @@ #include "error.h" #include "misc.h" -#define ERR_DOMAIN CR_THREADS_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR /** Parallel Compression */ diff --git a/src/xml_dump_deltapackage.c b/src/xml_dump_deltapackage.c index 722a600..089dc53 100644 --- a/src/xml_dump_deltapackage.c +++ b/src/xml_dump_deltapackage.c @@ -31,7 +31,7 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#define ERR_DOMAIN CR_XML_DUMP_DELTAPACKAGE_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define INDENT 4 void diff --git a/src/xml_dump_filelists.c b/src/xml_dump_filelists.c index 3486a43..3a4d237 100644 --- a/src/xml_dump_filelists.c +++ b/src/xml_dump_filelists.c @@ -28,7 +28,7 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#define ERR_DOMAIN CR_XML_DUMP_FILELISTS_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR void diff --git a/src/xml_dump_other.c b/src/xml_dump_other.c index 6df2cee..4dbd9a7 100644 --- a/src/xml_dump_other.c +++ b/src/xml_dump_other.c @@ -29,7 +29,7 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#define ERR_DOMAIN CR_XML_DUMP_OTHER_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR void diff --git a/src/xml_dump_primary.c b/src/xml_dump_primary.c index 82ac470..960f111 100644 --- a/src/xml_dump_primary.c +++ b/src/xml_dump_primary.c @@ -28,7 +28,7 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#define ERR_DOMAIN CR_XML_DUMP_PRIMARY_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR typedef enum { diff --git a/src/xml_dump_updateinfo.c b/src/xml_dump_updateinfo.c index ef37ed7..fb8753a 100644 --- a/src/xml_dump_updateinfo.c +++ b/src/xml_dump_updateinfo.c @@ -29,7 +29,7 @@ #include "xml_dump.h" #include "xml_dump_internal.h" -#define ERR_DOMAIN CR_XML_DUMP_UPDATEINFO_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define INDENT 2 void diff --git a/src/xml_file.c b/src/xml_file.c index b2c01e6..65fb945 100644 --- a/src/xml_file.c +++ b/src/xml_file.c @@ -25,7 +25,7 @@ #include "compression_wrapper.h" #include "xml_dump_internal.h" -#define ERR_DOMAIN CR_XML_FILE_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define XML_HEADER "\n" diff --git a/src/xml_parser.c b/src/xml_parser.c index 714680b..c2378f1 100644 --- a/src/xml_parser.c +++ b/src/xml_parser.c @@ -26,7 +26,7 @@ #include "xml_parser_internal.h" #include "misc.h" -#define ERR_DOMAIN CR_XML_PARSER_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR cr_ParserData * diff --git a/src/xml_parser_filelists.c b/src/xml_parser_filelists.c index e24919e..7ae6a35 100644 --- a/src/xml_parser_filelists.c +++ b/src/xml_parser_filelists.c @@ -30,7 +30,7 @@ #include "package.h" #include "misc.h" -#define ERR_DOMAIN CR_XML_PARSER_FIL_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define ERR_CODE_XML CRE_BADXMLFILELISTS typedef enum { diff --git a/src/xml_parser_other.c b/src/xml_parser_other.c index ea64215..b6606c0 100644 --- a/src/xml_parser_other.c +++ b/src/xml_parser_other.c @@ -30,7 +30,7 @@ #include "package.h" #include "misc.h" -#define ERR_DOMAIN CR_XML_PARSER_OTH_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define ERR_CODE_XML CRE_BADXMLOTHER typedef enum { diff --git a/src/xml_parser_primary.c b/src/xml_parser_primary.c index 019bf62..4c1b7e7 100644 --- a/src/xml_parser_primary.c +++ b/src/xml_parser_primary.c @@ -30,7 +30,7 @@ #include "package.h" #include "misc.h" -#define ERR_DOMAIN CR_XML_PARSER_PRI_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define ERR_CODE_XML CRE_BADXMLPRIMARY typedef enum { diff --git a/src/xml_parser_repomd.c b/src/xml_parser_repomd.c index d445a95..dba2b55 100644 --- a/src/xml_parser_repomd.c +++ b/src/xml_parser_repomd.c @@ -30,7 +30,7 @@ #include "package.h" #include "misc.h" -#define ERR_DOMAIN CR_XML_PARSER_REPOMD_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define ERR_CODE_XML CRE_BADXMLREPOMD typedef enum { diff --git a/src/xml_parser_updateinfo.c b/src/xml_parser_updateinfo.c index 9c0c33b..ab84b65 100644 --- a/src/xml_parser_updateinfo.c +++ b/src/xml_parser_updateinfo.c @@ -30,7 +30,7 @@ #include "error.h" #include "misc.h" -#define ERR_DOMAIN CR_XML_PARSER_UPDATEINFO_ERROR +#define ERR_DOMAIN CREATEREPO_C_ERROR #define ERR_CODE_XML CRE_BADXMLUPDATEINFO typedef enum {