G_LOG_DOMAIN definition moved to CMake (removed logging.h)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 733f1fdb07adbcbb01c3b4aa2ebbc03546ae5298..73e431998279192166cd2dd2638efe5b6ab1be3c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,9 @@ ENDIF()
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
+SET(G_LOG_DOMAIN "C_CREATEREPOLIB")
 
-# Find necessare libraries
+# Find necessary libraries
 
 find_package(BZip2 REQUIRED)
 find_package(CURL REQUIRED)

diff --git a/doc/Doxyfile.in.in b/doc/Doxyfile.in.in
index cf96424706c7a14a0d02f3b09d02c7253cac3878..bd6b5a736ec5b750f7466ecb10175b6b05f66468 100644 (file)
--- a/doc/Doxyfile.in.in
+++ b/doc/Doxyfile.in.in
@@ -714,7 +714,6 @@ EXCLUDE_SYMLINKS       = NO
 
 EXCLUDE_PATTERNS       = *_wrap.* \
                          cmd_parser.* \
-                         logging.h \
                          *_internal.h
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c0799782d140ab67cc6c4d5b971f783340fa075..2f7c4fa45b8f68c0cee97fb064257e3f3c094fcb 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,8 @@ TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZLIB_LIBRARY})
 SET_TARGET_PROPERTIES(libcreaterepo_c PROPERTIES
                       OUTPUT_NAME "createrepo_c"
                       SOVERSION ${CR_MAJOR}
-                      VERSION "${VERSION}")
+                      VERSION "${VERSION}"
+                      COMPILE_DEFINITIONS "G_LOG_DOMAIN=\"${G_LOG_DOMAIN}\"")
 
 ADD_EXECUTABLE(createrepo_c createrepo_c.c cmd_parser.c)
 TARGET_LINK_LIBRARIES(createrepo_c

diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
index 8a6b19c9163bf2640c5737d855801cf9e824b0ff..e7f0e629deb42ac426b6ff4cd932316d8eee57e7 100644 (file)
--- a/src/compression_wrapper.c
+++ b/src/compression_wrapper.c
@@ -29,7 +29,6 @@
 #include <zlib.h>
 #include <bzlib.h>
 #include <lzma.h>
-#include "logging.h"
 #include "error.h"
 #include "compression_wrapper.h"
 

diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index f1e215862c4a557914ba89a17f387677fb0f5519..497d7af6276c6c6fd5a7bdabc5314d9690494eb4 100644 (file)
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -44,7 +44,6 @@
 #include "xml_file.h"
 
 
-#define G_LOG_DOMAIN        ((gchar*) 0)
 #define MAX_TASK_BUFFER_LEN 20
 
 

diff --git a/src/load_metadata.c b/src/load_metadata.c
index 35b0e1c70d7bc06000d0e96ac19dcb50de095654..d228121ae20469334817f07d2a59101fbd3ed076 100644 (file)
--- a/src/load_metadata.c
+++ b/src/load_metadata.c
@@ -25,7 +25,6 @@
 #include <assert.h>
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 #include "load_metadata.h"
 #include "locate_metadata.h"

diff --git a/src/locate_metadata.c b/src/locate_metadata.c
index c1a76696fb673a65e3ff8344dd8830b1f0dbb250..c1e363a0fb444dfd571383b923f37bebca47d2fb 100644 (file)
--- a/src/locate_metadata.c
+++ b/src/locate_metadata.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <errno.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "locate_metadata.h"
 #include "repomd.h"

diff --git a/src/logging.h b/src/logging.h
deleted file mode 100644 (file)
index 71c33f8..0000000
--- a/src/logging.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* createrepo_c - Library of routines for manipulation with repodata
- * Copyright (C) 2012  Tomas Mlcoch
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA.
- */
-
-#ifndef __C_CREATEREPOLIB_LOGGING_H__
-#define __C_CREATEREPOLIB_LOGGING_H__
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN    "C_CREATEREPOLIB"
-
-#endif /* __C_CREATEREPOLIB_LOGGING_H__ */

diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c
index ca3d8c58c029efa783296cbb4522e8fbda2752f4..4b2150a091133c2d4847137875a094f2bbea8ca9 100644 (file)
--- a/src/mergerepo_c.c
+++ b/src/mergerepo_c.c
@@ -43,8 +43,6 @@
 //  - rozvijet architekturu na listy tak jak to dela mergedrepo
 
 
-#define G_LOG_DOMAIN    ((gchar*) 0)
-
 #define DEFAULT_OUTPUTDIR               "merged_repo/"
 #define DEFAULT_DB_COMPRESSION_TYPE             CR_CW_BZ2_COMPRESSION
 #define DEFAULT_GROUPFILE_COMPRESSION_TYPE      CR_CW_GZ_COMPRESSION

diff --git a/src/misc.c b/src/misc.c
index 14b34125f8f0b8b733307b45eb4a24dca0d9a8a3..c7a6112c4a55080ebe6254e74a17ecc92e66509b 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -32,7 +32,6 @@
 #include <curl/curl.h>
 #include <rpm/rpmlib.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 
 #define BUFFER_SIZE     4096

diff --git a/src/modifyrepo_c.c b/src/modifyrepo_c.c
index 3e43882401a7a8b72161785828ae1666dfb0606a..d4f321ca63408f4d034db019a14d2251a5e35a0b 100644 (file)
--- a/src/modifyrepo_c.c
+++ b/src/modifyrepo_c.c
@@ -37,8 +37,6 @@
 #include "xml_file.h"
 #include "modifyrepo_shared.h"
 
-#define G_LOG_DOMAIN            ((gchar*) 0)
-
 typedef struct {
 
     gboolean version;

diff --git a/src/modifyrepo_shared.c b/src/modifyrepo_shared.c
index 43241e0cec43c1f0051a011186e33ed36f4cad2f..9e39c0e6bcc48b4e5a2b3e149dac72b09948d298 100644 (file)
--- a/src/modifyrepo_shared.c
+++ b/src/modifyrepo_shared.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <assert.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "checksum.h"
 #include "modifyrepo_shared.h"

diff --git a/src/package.c b/src/package.c
index 1e83bd096ecdc939c3f89786041df90e5364564d..8fd09ecef4d284546ff828d14bff12a411acfcc0 100644 (file)
--- a/src/package.c
+++ b/src/package.c
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define PACKAGE_CHUNK_SIZE 2048

diff --git a/src/parsehdr.c b/src/parsehdr.c
index a5db4765e63f67d09408a11f41d5fd1dde0fe7c0..de21a6144bb79f819155061acb808f5ee6c89e91 100644 (file)
--- a/src/parsehdr.c
+++ b/src/parsehdr.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <rpm/rpmfi.h>
 #include <stdlib.h>
-#include "logging.h"
 #include "parsehdr.h"
 #include "xml_dump.h"
 #include "misc.h"

diff --git a/src/parsepkg.c b/src/parsepkg.c
index 75b4877b386c9a1ed069957ba53e4be8f54591d2..f3f284fe1c9e10764e2717ca6d886710dcdadaaf 100644 (file)
--- a/src/parsepkg.c
+++ b/src/parsepkg.c
@@ -29,7 +29,6 @@
 #include <rpm/rpmlib.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmkeyring.h>
-#include "logging.h"
 #include "error.h"
 #include "parsehdr.h"
 #include "misc.h"

diff --git a/src/repomd.c b/src/repomd.c
index dd4d92eee6c151dd8c2c3a4bcf68bc62df87fc2f..63ef93d42cfd209d71fad2aa6e6efc88a73b1e62 100644 (file)
--- a/src/repomd.c
+++ b/src/repomd.c
@@ -27,7 +27,6 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "checksum.h"
 #include "repomd.h"

diff --git a/src/sqlite.c b/src/sqlite.c
index 586807155aa6392dc62aec8e490cb8a0245f65f8..3ce44e76a38208cd7b2a8069afcab74a8b8f2b75 100644 (file)
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -26,7 +26,6 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include "logging.h"
 #include "misc.h"
 #include "sqlite.h"
 #include "error.h"

diff --git a/src/xml_dump.c b/src/xml_dump.c
index 69458f0b9bc199d4d81ee7d86c54ce61c2c19ad5..6a303eabcc2b9b3943f91bbc9e1fc9c3ab3560ed 100644 (file)
--- a/src/xml_dump.c
+++ b/src/xml_dump.c
@@ -24,7 +24,6 @@
 #include <libxml/parser.h>
 #include <string.h>
 #include "error.h"
-#include "logging.h"
 #include "misc.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"

diff --git a/src/xml_dump_filelists.c b/src/xml_dump_filelists.c
index 1bb9cb0f6230f176dde801460f7466a4d720520e..7011ead2e0b2910d49acbe63afbb0a0c3b6c150b 100644 (file)
--- a/src/xml_dump_filelists.c
+++ b/src/xml_dump_filelists.c
@@ -24,7 +24,6 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include "error.h"
-#include "logging.h"
 #include "package.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"

diff --git a/src/xml_dump_other.c b/src/xml_dump_other.c
index cd629c7cc4b7a8f80ef4bd9b5705fd2f2242d861..975fca5ed2398636c249837c407895a3fe4173ed 100644 (file)
--- a/src/xml_dump_other.c
+++ b/src/xml_dump_other.c
@@ -25,7 +25,6 @@
 #include <libxml/xmlwriter.h>
 #include <libxml/xmlsave.h>
 #include "error.h"
-#include "logging.h"
 #include "package.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"

diff --git a/src/xml_dump_primary.c b/src/xml_dump_primary.c
index df98fd73636fcfb68b943a32c7644fa91f6766bd..9fd5b241ed1c58b580706eb4607a470f0cf806f7 100644 (file)
--- a/src/xml_dump_primary.c
+++ b/src/xml_dump_primary.c
@@ -24,7 +24,6 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 #include "error.h"
-#include "logging.h"
 #include "package.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"

diff --git a/src/xml_dump_repomd.c b/src/xml_dump_repomd.c
index 5860a6de91785655df1af09561d4b39fb0f30645..6da5646289c52a7099307feeea81cd8922a278ad 100644 (file)
--- a/src/xml_dump_repomd.c
+++ b/src/xml_dump_repomd.c
@@ -25,7 +25,6 @@
 #include <libxml/xmlwriter.h>
 #include <libxml/xmlsave.h>
 #include "error.h"
-#include "logging.h"
 #include "repomd.h"
 #include "xml_dump.h"
 #include "xml_dump_internal.h"

diff --git a/src/xml_parser_filelists.c b/src/xml_parser_filelists.c
index e7cb51b22d956352785d76ad482a78c416f87ed1..32a5d2c19ff42a09446d0ca9bc4876a0d4d3faf8 100644 (file)
--- a/src/xml_parser_filelists.c
+++ b/src/xml_parser_filelists.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_FIL_ERROR

diff --git a/src/xml_parser_other.c b/src/xml_parser_other.c
index af560a288a69b1a30880896c56087e8818b779b6..5a34bcda19b1dc6c052087a42c88c8dd20f47982 100644 (file)
--- a/src/xml_parser_other.c
+++ b/src/xml_parser_other.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_OTH_ERROR

diff --git a/src/xml_parser_primary.c b/src/xml_parser_primary.c
index 9f964eb6bcdc487638b9bbe7f16da51ecef4b262..bccb054899b3759ec16fcec9e1407dbbe23af6fe 100644 (file)
--- a/src/xml_parser_primary.c
+++ b/src/xml_parser_primary.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_PRI_ERROR

diff --git a/src/xml_parser_repomd.c b/src/xml_parser_repomd.c
index f9559da3493bebf1e05841df3c338acf8bd18ef1..dd0571346d39b8d9648fade2d0b6d16092e354f0 100644 (file)
--- a/src/xml_parser_repomd.c
+++ b/src/xml_parser_repomd.c
@@ -28,7 +28,6 @@
 #include "xml_parser.h"
 #include "error.h"
 #include "package.h"
-#include "logging.h"
 #include "misc.h"
 
 #define ERR_DOMAIN      CR_XML_PARSER_REPOMD_ERROR