From 36e0d1c5829e9d380552c43fbe06cc96b1ad50ff Mon Sep 17 00:00:00 2001
From: Tomas Mlcoch <tmlcoch@redhat.com>
Date: Wed, 3 Apr 2013 14:59:49 +0200
Subject: [PATCH] Code refactoring.

---
 CMakeLists.txt      | 1 +
 src/load_metadata.c | 2 +-
 src/parsehdr.c      | 4 ++--
 src/parsepkg.c      | 2 --
 src/sqlite.c        | 4 ++--
 src/xml_dump.c      | 8 ++++----
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fef5f39..53b6f89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 PROJECT (createrepo_c)
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
 
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
 set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -Wall -Wextra")
 IF(NOT CMAKE_BUILD_TYPE)
     SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
diff --git a/src/load_metadata.c b/src/load_metadata.c
index 0125c9d..46f6268 100644
--- a/src/load_metadata.c
+++ b/src/load_metadata.c
@@ -186,7 +186,7 @@ cr_metadata_free(cr_Metadata md)
 
 
 
-inline gchar *
+static inline gchar *
 cr_chunk_insert_len_or_null (GStringChunk *chunk, const gchar *str, gssize len)
 {
     if (!str || len <= 0)
diff --git a/src/parsehdr.c b/src/parsehdr.c
index 8dbca64..447acde 100644
--- a/src/parsehdr.c
+++ b/src/parsehdr.c
@@ -27,7 +27,7 @@
 #include "misc.h"
 
 
-inline gchar *
+static inline gchar *
 cr_safe_string_chunk_insert(GStringChunk *chunk, const char *str)
 {
     if (!chunk || !str) {
@@ -38,7 +38,7 @@ cr_safe_string_chunk_insert(GStringChunk *chunk, const char *str)
 }
 
 
-inline int
+static inline int
 cr_compare_dependency(const char *dep1, const char *dep2)
 {
     /* Compares two dependency by name
diff --git a/src/parsepkg.c b/src/parsepkg.c
index dae17a2..c27277b 100644
--- a/src/parsepkg.c
+++ b/src/parsepkg.c
@@ -42,8 +42,6 @@ rpmts cr_ts = NULL;
 void
 cr_package_parser_init()
 {
-    rpmKeyring keyring;
-
     if (cr_initialized)
         return;
     cr_initialized = 1;
diff --git a/src/sqlite.c b/src/sqlite.c
index 51d99dd..f9a9987 100644
--- a/src/sqlite.c
+++ b/src/sqlite.c
@@ -609,7 +609,7 @@ db_package_prepare (sqlite3 *db, GError **err)
 }
 
 
-inline const char *
+static inline const char *
 prevent_null(const char *str)
 {
     if (!str)
@@ -618,7 +618,7 @@ prevent_null(const char *str)
         return str;
 }
 
-inline const char *
+static inline const char *
 force_null(const char *str)
 {
     if (!str || str[0] == '\0')
diff --git a/src/xml_dump.c b/src/xml_dump.c
index a230ea0..5f4b126 100644
--- a/src/xml_dump.c
+++ b/src/xml_dump.c
@@ -75,11 +75,11 @@ cr_xmlNewTextChild(xmlNodePtr parent,
     xmlNodePtr child;
 
     if (!orig_content) {
-        content = "";
+        content = BAD_CAST "";
     } else if (xmlCheckUTF8(orig_content)) {
         content = (xmlChar *) orig_content;
     } else {
-        size_t len = strlen(orig_content);
+        size_t len = strlen((const char *) orig_content);
         content = malloc(sizeof(xmlChar)*len*2 + 1);
         cr_latin1_to_utf8(orig_content, content);
         free_content = 1;
@@ -101,11 +101,11 @@ cr_xmlNewProp(xmlNodePtr node, const xmlChar *name, const xmlChar *orig_content)
     xmlAttrPtr attr;
 
     if (!orig_content) {
-        content = "";
+        content = BAD_CAST "";
     } else if (xmlCheckUTF8(orig_content)) {
         content = (xmlChar *) orig_content;
     } else {
-        size_t len = strlen(orig_content);
+        size_t len = strlen((const char *) orig_content);
         content = malloc(sizeof(xmlChar)*len*2 + 1);
         cr_latin1_to_utf8(orig_content, content);
         free_content = 1;
-- 
2.7.4