From 38a5c865cd1050a2763ad5af9b2614c6b61e72b8 Mon Sep 17 00:00:00 2001
From: Tomas Mlcoch <tmlcoch@redhat.com>
Date: Mon, 30 Mar 2015 13:19:35 +0200
Subject: [PATCH] error: Rename domain CR_CREATEREPO_C_ERROR ->
 CREATEREPO_C_ERROR

---
 src/createrepo_shared.c | 14 +++++++-------
 src/error.c             |  7 +++++--
 src/error.h             |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/createrepo_shared.c b/src/createrepo_shared.c
index e95ef80..4b93224 100644
--- a/src/createrepo_shared.c
+++ b/src/createrepo_shared.c
@@ -46,7 +46,7 @@ cr_block_terminating_signals(GError **err)
     sigaddset(&intmask, SIGVTALRM);
 
     if (sigprocmask(SIG_BLOCK, &intmask, NULL)) {
-        g_set_error(err, CR_CREATEREPO_C_ERROR, CRE_SIGPROCMASK,
+        g_set_error(err, CREATEREPO_C_ERROR, CRE_SIGPROCMASK,
                     "Cannot block terminating signals: %s", strerror(errno));
         return FALSE;
     }
@@ -74,7 +74,7 @@ cr_unblock_terminating_signals(GError **err)
     sigaddset(&intmask, SIGVTALRM);
 
     if (sigprocmask(SIG_UNBLOCK, &intmask, NULL)) {
-        g_set_error(err, CR_CREATEREPO_C_ERROR, CRE_SIGPROCMASK,
+        g_set_error(err, CREATEREPO_C_ERROR, CRE_SIGPROCMASK,
                     "Cannot unblock terminating signals: %s", strerror(errno));
         return FALSE;
     }
@@ -100,7 +100,7 @@ cr_lock_repo(const gchar *repo_dir,
 
     if (g_mkdir(lock_dir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) {
         if (errno != EEXIST) {
-            g_set_error(err, CR_CREATEREPO_C_ERROR, CRE_IO,
+            g_set_error(err, CREATEREPO_C_ERROR, CRE_IO,
                         "Error while creating temporary repodata "
                         "directory: %s: %s", lock_dir, strerror(errno));
             return FALSE;
@@ -110,7 +110,7 @@ cr_lock_repo(const gchar *repo_dir,
                 "(Another createrepo process is running?)", lock_dir);
 
         if (ignore_lock == FALSE) {
-            g_set_error(err, CR_CREATEREPO_C_ERROR, CRE_IO,
+            g_set_error(err, CREATEREPO_C_ERROR, CRE_IO,
                         "Temporary repodata directory %s already exists! "
                         "(Another createrepo process is running?)", lock_dir);
             return FALSE;
@@ -126,7 +126,7 @@ cr_lock_repo(const gchar *repo_dir,
         } else {
             g_critical("(--ignore-lock enabled) Cannot remove %s: %s",
                        lock_dir, tmp_err->message);
-            g_set_error(err, CR_CREATEREPO_C_ERROR, CRE_IO,
+            g_set_error(err, CREATEREPO_C_ERROR, CRE_IO,
                         "Cannot remove %s (--ignore-lock enabled) :%s",
                         lock_dir, tmp_err->message);
             return FALSE;
@@ -136,7 +136,7 @@ cr_lock_repo(const gchar *repo_dir,
         if (g_mkdir(lock_dir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) {
             g_critical("(--ignore-lock enabled) Cannot create %s: %s",
                        lock_dir, strerror(errno));
-            g_set_error(err, CR_CREATEREPO_C_ERROR, CRE_IO,
+            g_set_error(err, CREATEREPO_C_ERROR, CRE_IO,
                         "Cannot create: %s (--ignore-lock enabled): %s",
                         lock_dir, strerror(errno));
             return FALSE;
@@ -154,7 +154,7 @@ cr_lock_repo(const gchar *repo_dir,
         if (g_mkdir(tmp_repodata_dir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH)) {
             g_critical("(--ignore-lock enabled) Cannot create %s: %s",
                        tmp_repodata_dir, strerror(errno));
-            g_set_error(err, CR_CREATEREPO_C_ERROR, CRE_IO,
+            g_set_error(err, CREATEREPO_C_ERROR, CRE_IO,
                         "Cannot create: %s (--ignore-lock enabled): %s",
                         tmp_repodata_dir, strerror(errno));
             return FALSE;
diff --git a/src/error.c b/src/error.c
index 2ee25b4..8ba246a 100644
--- a/src/error.c
+++ b/src/error.c
@@ -91,9 +91,12 @@ cr_strerror(cr_Error rc)
 }
 
 GQuark
-cr_createrepo_c_error_quark(void)
+createrepo_c_error_quark(void)
 {
-    return g_quark_from_static_string("cr_createrepo_c_error");
+    static GQuark quark = 0;
+    if (!quark)
+            quark = g_quark_from_static_string ("createrepo_c_error");
+    return quark;
 }
 
 GQuark
diff --git a/src/error.h b/src/error.h
index 7a9ba97..f7b5c7d 100644
--- a/src/error.h
+++ b/src/error.h
@@ -105,7 +105,7 @@ typedef enum {
 const char *cr_strerror(cr_Error rc);
 
 /* Error domains */
-#define CR_CREATEREPO_C_ERROR           cr_createrepo_c_error_quark()
+#define CREATEREPO_C_ERROR              createrepo_c_error_quark()
 #define CR_CHECKSUM_ERROR               cr_checksum_error_quark()
 #define CR_CMD_ERROR                    cr_cmd_error_quark()
 #define CR_COMPRESSION_WRAPPER_ERROR    cr_compression_wrapper_error_quark()
@@ -133,7 +133,7 @@ const char *cr_strerror(cr_Error rc);
 #define CR_XML_PARSER_REPOMD_ERROR      cr_xml_parser_repomd_error_quark()
 #define CR_XML_PARSER_UPDATEINFO_ERROR  cr_xml_parser_updateinfo_error_quark()
 
-GQuark cr_createrepo_c_error_quark(void);
+GQuark createrepo_c_error_quark(void);
 GQuark cr_checksum_error_quark(void);
 GQuark cr_cmd_error_quark(void);
 GQuark cr_compression_wrapper_error_quark(void);
-- 
2.7.4