diff options
author | kremlin <ian@kremlin.cc> | 2014-07-08 16:15:51 +0800 |
---|---|---|
committer | kremlin <ian@kremlin.cc> | 2014-07-08 16:15:51 +0800 |
commit | c09a09bfcbfbd12fb6b48e06f087429b1b6ac864 (patch) | |
tree | aabd94f29221a52021dc646ff91e0a3131f3c527 /src/interfaces | |
parent | 828caf9aaa256154d5998d7d3f6b57b434550a7c (diff) | |
download | systembsd-c09a09bfcbfbd12fb6b48e06f087429b1b6ac864.tar systembsd-c09a09bfcbfbd12fb6b48e06f087429b1b6ac864.tar.gz systembsd-c09a09bfcbfbd12fb6b48e06f087429b1b6ac864.tar.bz2 systembsd-c09a09bfcbfbd12fb6b48e06f087429b1b6ac864.tar.lz systembsd-c09a09bfcbfbd12fb6b48e06f087429b1b6ac864.tar.xz systembsd-c09a09bfcbfbd12fb6b48e06f087429b1b6ac864.tar.zst systembsd-c09a09bfcbfbd12fb6b48e06f087429b1b6ac864.zip |
more work on managing four interfaces as separate PIDs, new makefile rules for building and installing standalone interface binaries, a little documentation and preproccessor logic
Diffstat (limited to 'src/interfaces')
-rw-r--r-- | src/interfaces/hostnamed/hostnamed.c | 16 | ||||
-rw-r--r-- | src/interfaces/localed/localed.c | 3 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c index ad7df31..f250aaa 100644 --- a/src/interfaces/hostnamed/hostnamed.c +++ b/src/interfaces/hostnamed/hostnamed.c @@ -196,22 +196,9 @@ static void hostnamed_on_name_lost(GDBusConnection *conn, } /* safe call to try and start hostnamed */ -GError *hostnamed_init() { +void hostnamed_init() { guint bus_descriptor; - GError *err = NULL; - gchar **hostnamed_ispect_xml; - gchar *hostnamed_joined_xml; - - hostnamed_freeable = g_ptr_array_new(); - hostnamed_ispect_xml = g_malloc(3000); - - g_file_get_contents("conf/hostnamed-ispect.xml", hostnamed_ispect_xml, NULL, NULL); - hostnamed_joined_xml = g_strjoinv("\n", hostnamed_ispect_xml); - spect_data = g_dbus_node_info_new_for_xml(hostnamed_joined_xml, NULL); - - g_free(hostnamed_ispect_xml); - g_ptr_array_add(hostnamed_freeable, hostnamed_joined_xml); bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM, "org.freedesktop.hostname1", @@ -223,7 +210,6 @@ GError *hostnamed_init() { NULL); /* TODO: malloc and return reference as if a main() closed */ - return err; } /* free()'s */ diff --git a/src/interfaces/localed/localed.c b/src/interfaces/localed/localed.c index 910c1e1..ef4fdea 100644 --- a/src/interfaces/localed/localed.c +++ b/src/interfaces/localed/localed.c @@ -114,7 +114,7 @@ static void localed_on_name_lost(GDBusConnection *conn, } /* safe call to try and start localed */ -GError *localed_init() { +void localed_init() { guint bus_descriptor; GError *err = NULL; @@ -141,7 +141,6 @@ GError *localed_init() { NULL); /* TODO: malloc and return reference as if a main() closed */ - return err; } /* free()'s */ |