Adjustments.

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e41a49c18655bf31f1bba86e89b0179ef8c19e4..5019c3e06aa147a9d1e92e72e39147b9a768bb51 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,8 @@ LIBS = $(LIBCONFI_LIBS)
 
 lib_LTLIBRARIES = libconfi.la
 
-libconfi_la_SOURCES = libconfi.c \
+libconfi_la_SOURCES = commons.c \
+                      libconfi.c \
                       confipluggable.c
 
 libconfi_la_LDFLAGS = -no-undefined

diff --git a/src/commons.c b/src/commons.c
new file mode 100644 (file)
index 0000000..fab690f
--- /dev/null
+++ b/src/commons.c
@@ -0,0 +1,77 @@
+/*
+ * commons.c
+ * This file is part of libconfi
+ *
+ * Copyright (C) 2014 Andrea Zagli <azagli@libero.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Library 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 Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <commons.h>
+
+ConfiConfi
+*confi_confi_copy (ConfiConfi *confi)
+{
+       ConfiConfi *b;
+
+       b = g_slice_new (ConfiConfi);
+       b->name = g_strdup (confi->name);
+       b->description = g_strdup (confi->description);
+
+       return b;
+}
+
+void
+confi_confi_free (ConfiConfi *confi)
+{
+       g_free (confi->name);
+       g_free (confi->description);
+       g_slice_free (ConfiConfi, confi);
+}
+
+G_DEFINE_BOXED_TYPE (ConfiConfi, confi_confi, confi_confi_copy, confi_confi_free)
+
+ConfiKey
+*confi_key_copy (ConfiKey *key)
+{
+       ConfiKey *b;
+
+       b = g_slice_new (ConfiKey);
+       b->id_config = key->id_config;
+       b->id = key->id;
+       b->id_parent = key->id_parent;
+       b->key = g_strdup (key->key);
+       b->value = g_strdup (key->value);
+       b->description = g_strdup (key->description);
+       b->path = g_strdup (key->path);
+
+       return b;
+}
+
+void
+confi_key_free (ConfiKey *key)
+{
+       g_free (key->key);
+       g_free (key->value);
+       g_free (key->description);
+       g_free (key->path);
+       g_slice_free (ConfiKey, key);
+}
+
+G_DEFINE_BOXED_TYPE (ConfiKey, confi_key, confi_key_copy, confi_key_free)

diff --git a/src/libconfi.c b/src/libconfi.c
index 9f6110f3f00ec653c08f8ffd7097f8272aebb6db..9946a90a04f456ff4f2c014fe4ba49c81adacb5a 100644 (file)
--- a/src/libconfi.c
+++ b/src/libconfi.c
@@ -28,58 +28,6 @@
 #include "libconfi.h"
 
 
-ConfiConfi
-*confi_confi_copy (ConfiConfi *confi)
-{
-       ConfiConfi *b;
-
-       b = g_slice_new (ConfiConfi);
-       b->name = g_strdup (confi->name);
-       b->description = g_strdup (confi->description);
-
-       return b;
-}
-
-void
-confi_confi_free (ConfiConfi *confi)
-{
-       g_free (confi->name);
-       g_free (confi->description);
-       g_slice_free (ConfiConfi, confi);
-}
-
-G_DEFINE_BOXED_TYPE (ConfiConfi, confi_confi, confi_confi_copy, confi_confi_free)
-
-ConfiKey
-*confi_key_copy (ConfiKey *key)
-{
-       ConfiKey *b;
-
-       b = g_slice_new (ConfiKey);
-       b->id_config = key->id_config;
-       b->id = key->id;
-       b->id_parent = key->id_parent;
-       b->key = g_strdup (key->key);
-       b->value = g_strdup (key->value);
-       b->description = g_strdup (key->description);
-       b->path = g_strdup (key->path);
-
-       return b;
-}
-
-void
-confi_key_free (ConfiKey *key)
-{
-       g_free (key->key);
-       g_free (key->value);
-       g_free (key->description);
-       g_free (key->path);
-       g_slice_free (ConfiKey, key);
-}
-
-G_DEFINE_BOXED_TYPE (ConfiKey, confi_key, confi_key_copy, confi_key_free)
-
-
 enum
 {
        PROP_0,
@@ -624,8 +572,6 @@ confi_destroy (Confi *confi)
 {
        ConfiPrivate *priv = CONFI_GET_PRIVATE (confi);
 
-       gdaex_free (priv->gdaex);
-       g_hash_table_destroy (priv->values);
        g_free (priv->name);
        g_free (priv->description);
        g_free (priv->root);