From 1e8c7c889a1c3b92c58fb1590b2f1192dd86623b Mon Sep 17 00:00:00 2001 From: kremlin Date: Mon, 14 Jul 2014 23:55:24 -0500 Subject: [PATCH] remove includes in non-gen'd interf files, they're linked properly now no need to include foo-gen.c as its functionality exists inside linked object built by makefile in future commit. additionally, make all non-generated interface files executable with a dummy main() that runs foo_init() after setting everything up properly with a g_main_loop --- src/interfaces/hostnamed/hostnamed.c | 28 +++++++---- src/interfaces/localed/localed.c | 72 ++++++++-------------------- src/interfaces/logind/logind.c | 4 ++ src/interfaces/timedated/timedated.c | 5 ++ 4 files changed, 48 insertions(+), 61 deletions(-) diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index e161497..0cdbd36 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -19,11 +19,7 @@ #include -#include -#include - -#include "hostnamed.h" -#include "hostnamed-gen.c" +#include "hostnamed-gen.h" GPtrArray *hostnamed_freeable; GDBusNodeInfo *spect_data; @@ -191,6 +187,12 @@ static void hostnamed_on_name_acquired(GDBusConnection *conn, } +/* free()'s */ +void hostnamed_mem_clean() { + + g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); +} + static void hostnamed_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { @@ -220,10 +222,19 @@ void hostnamed_init() { /* TODO: malloc and return reference as if a main() closed */ } -/* free()'s */ -void hostnamed_mem_clean() { +int main() { - g_ptr_array_foreach(hostnamed_freeable, (GFunc) g_free, NULL); + GMainLoop *hostnamed_loop; + hostnamed_loop = g_main_loop_new(NULL, TRUE); + + /* config stuff here */ + + + hostnamed_init(); + g_main_loop_run(hostnamed_loop); + g_main_loop_unref(hostnamed_loop); + + return 0; } /* TODO figure out DMI variables on obsd */ @@ -271,3 +282,4 @@ void hostnamed_mem_clean() { g_free (filebuf); return ret; }*/ + diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c index ef4fdea..d6bf1aa 100644 --- a/src/interfaces/localed/localed.c +++ b/src/interfaces/localed/localed.c @@ -17,11 +17,7 @@ #include #include -#include -#include - -#include "localed.h" -#include "localed-gen.c" +#include "localed-gen.h" GPtrArray *localed_freeable; GDBusNodeInfo *spect_data; @@ -101,6 +97,12 @@ static void localed_on_name_acquired(GDBusConnection *conn, } +/* free()'s */ +void localed_mem_clean() { + + g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL); +} + static void localed_on_name_lost(GDBusConnection *conn, const gchar *name, gpointer user_data) { @@ -143,54 +145,18 @@ void localed_init() { /* TODO: malloc and return reference as if a main() closed */ } -/* free()'s */ -void localed_mem_clean() { +int main() { + + GMainLoop *localed_loop; + localed_loop = g_main_loop_new(NULL, TRUE); - g_ptr_array_foreach(localed_freeable, (GFunc) g_free, NULL); + /* config stuff here */ + + localed_init(); + + g_main_loop_run(localed_loop); + g_main_loop_unref(localed_loop); + + return 0; } -/* TODO figure out DMI variables on obsd */ -/*static gchar *guess_icon_name() { - - gchar *filebuf = NULL; - gchar *ret = NULL; - - #if defined(__i386__) || defined(__x86_64__) - - Taken with a few minor changes from systemd's localed.c, - copyright 2011 Lennart Poettering. - - See the SMBIOS Specification 2.7.1 section 7.4.1 for - details about the values listed here: - - http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf - - - if (g_file_get_contents ("/sys/class/dmi/id/chassis_type", &filebuf, NULL, NULL)) { - switch (g_ascii_strtoull (filebuf, NULL, 10)) { - case 0x3: - case 0x4: - case 0x5: - case 0x6: - case 0x7: - ret = g_strdup ("computer-desktop"); - goto out; - case 0x9: - case 0xA: - case 0xE: - ret = g_strdup ("computer-laptop"); - goto out; - case 0x11: - case 0x17: - case 0x1C: - case 0x1D: - ret = g_strdup ("computer-server"); - goto out; - } - } - #endif - ret = g_strdup ("computer"); - out: - g_free (filebuf); - return ret; -}*/ diff --git a/src/interfaces/logind/logind.c b/src/interfaces/logind/logind.c index cf9b3f9..9e35d0f 100644 --- a/src/interfaces/logind/logind.c +++ b/src/interfaces/logind/logind.c @@ -13,4 +13,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "logind-gen.h" +int main() { + return 0; +} diff --git a/src/interfaces/timedated/timedated.c b/src/interfaces/timedated/timedated.c index cf9b3f9..0c9d430 100644 --- a/src/interfaces/timedated/timedated.c +++ b/src/interfaces/timedated/timedated.c @@ -14,3 +14,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "timedated-gen.h" + +int main() { + return 0; +} -- 2.41.0