minor, retab \t's to four spaces
authorkremlin <ian@kremlin.cc>
Wed, 6 Aug 2014 05:58:06 +0000 (00:58 -0500)
committerkremlin <ian@kremlin.cc>
Wed, 6 Aug 2014 05:58:06 +0000 (00:58 -0500)
src/interfaces/hostnamed/hostnamed.c
src/interfaces/localed/localed.c
src/interfaces/logind/logind.c
src/interfaces/timedated/timedated.c
src/main.c

index 2eadbe8789450ba1ff7df798d15caa78ed116925..6d83852788ab13c6faf08b88f5eaeffafdcce55a 100644 (file)
@@ -86,20 +86,20 @@ on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-       gchar *hostname_buf, *ret;
-       size_t hostname_divider;
+    gchar *hostname_buf, *ret;
+    size_t hostname_divider;
 
-       hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); /* todo check & free */
-       ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       g_ptr_array_add(hostnamed_freeable, hostname_buf);
-       g_ptr_array_add(hostnamed_freeable, ret);
+    hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN); /* todo check & free */
+    ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    g_ptr_array_add(hostnamed_freeable, hostname_buf);
+    g_ptr_array_add(hostnamed_freeable, ret);
 
-       if(gethostname(hostname_buf, MAXHOSTNAMELEN))
-               return "";
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+        return "";
 
-       hostname_divider = strcspn(hostname_buf, ".");
+    hostname_divider = strcspn(hostname_buf, ".");
 
-       return strncpy(ret, hostname_buf, hostname_divider);
+    return strncpy(ret, hostname_buf, hostname_divider);
 }
 
 const gchar *
@@ -164,7 +164,7 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn,
 
     g_printf("got bus/name, exporting %s's interface...\n", name);
 
-       hostnamed_interf = hostname1_skeleton_new();
+    hostnamed_interf = hostname1_skeleton_new();
 
     /* attach function pointers to generated struct's method handlers */
     g_signal_connect(hostnamed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL);
@@ -191,17 +191,17 @@ static void hostnamed_on_bus_acquired(GDBusConnection *conn,
                                          NULL)) {
 
         g_printf("failed to export %s's interface!\n", name); /* unusual edge case, TODO check errno */
-               hostnamed_mem_clean();
+        hostnamed_mem_clean();
 
     } else {
 
-               dbus_interface_exported = TRUE;
-               g_printf("exported %s's interface on the system bus...\n", name);
-       }
+        dbus_interface_exported = TRUE;
+        g_printf("exported %s's interface on the system bus...\n", name);
+    }
 }
 
 static void hostnamed_on_name_acquired(GDBusConnection *conn,
-                                          const gchar *name,
+                                       const gchar *name,
                                        gpointer user_data) {
 
     g_printf("success!\n");
@@ -211,11 +211,11 @@ static void hostnamed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-       if(!conn) {
+    if(!conn) {
 
-               g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
-               hostnamed_mem_clean();
-       }
+        g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
+        hostnamed_mem_clean();
+    }
 
     g_printf("lost name %s, exiting...\n", name);
 
@@ -228,45 +228,45 @@ static void hostnamed_on_name_lost(GDBusConnection *conn,
  * this stops our GMainLoop safely before letting main() return */
 void hostnamed_mem_clean() {
 
-       g_printf("exiting...\n");
+    g_printf("exiting...\n");
 
-       if(dbus_interface_exported)
-               g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(hostnamed_interf));
+    if(dbus_interface_exported)
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(hostnamed_interf));
 
-       if(g_main_loop_is_running(hostnamed_loop)) 
-               g_main_loop_quit(hostnamed_loop);
+    if(g_main_loop_is_running(hostnamed_loop)) 
+        g_main_loop_quit(hostnamed_loop);
 
 }
 
 /* wrapper for glib's unix signal handling; called only once if terminatating signal is raised against us */
 gboolean unix_sig_terminate_handler(gpointer data) {
 
-       g_printf("caught SIGINT/HUP/TERM, exiting\n");
+    g_printf("caught SIGINT/HUP/TERM, exiting\n");
 
-       hostnamed_mem_clean();
-       return G_SOURCE_REMOVE; 
+    hostnamed_mem_clean();
+    return G_SOURCE_REMOVE; 
 }
 
 void set_signal_handlers() {
 
-       /* we don't care about its descriptor, we never need to unregister these */
-       g_unix_signal_add(SIGINT,  unix_sig_terminate_handler, NULL);
-       g_unix_signal_add(SIGHUP,  unix_sig_terminate_handler, NULL);
-       g_unix_signal_add(SIGTERM, unix_sig_terminate_handler, NULL);
+    /* we don't care about its descriptor, we never need to unregister these */
+    g_unix_signal_add(SIGINT,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGHUP,  unix_sig_terminate_handler, NULL);
+    g_unix_signal_add(SIGTERM, unix_sig_terminate_handler, NULL);
 
-       /* TODO: the "only once" guarantee only counts towards specific signals.
-        *       make sure calling a SIGINT and SIGHUP doesn't cause term_handler()
-        *       to be called twice */
+    /* TODO: the "only once" guarantee only counts towards specific signals.
+     *       make sure calling a SIGINT and SIGHUP doesn't cause term_handler()
+     *       to be called twice */
 }
 
 int main() {
-       
-       set_signal_handlers();
+    
+    set_signal_handlers();
 
-       hostnamed_loop = g_main_loop_new(NULL, TRUE);
-       hostnamed_freeable = g_ptr_array_new();
+    hostnamed_loop = g_main_loop_new(NULL, TRUE);
+    hostnamed_freeable = g_ptr_array_new();
 
-       bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+    bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                    "org.freedesktop.hostname1",
                                    G_BUS_NAME_OWNER_FLAGS_NONE,
                                    hostnamed_on_bus_acquired,
@@ -275,17 +275,17 @@ int main() {
                                    NULL,
                                    NULL);
 
-       g_main_loop_run(hostnamed_loop);
-       /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
-       g_main_loop_unref(hostnamed_loop);
+    g_main_loop_run(hostnamed_loop);
+    /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
+    g_main_loop_unref(hostnamed_loop);
 
-       /* guaranteed unownable */
-       g_bus_unown_name(bus_descriptor);
+    /* guaranteed unownable */
+    g_bus_unown_name(bus_descriptor);
 
-       /* at this point no operations can occur with our data, it is safe to free it + its container */
-       g_ptr_array_free(hostnamed_freeable, TRUE);
+    /* at this point no operations can occur with our data, it is safe to free it + its container */
+    g_ptr_array_free(hostnamed_freeable, TRUE);
 
-       return 0;
+    return 0;
 }
 
 /* TODO figure out DMI variables on obsd */
index 160caafa932d40e628d33030a27fd7a7016621a5..f788441b06179135d3695f67a766b9bb409a44b2 100644 (file)
@@ -48,20 +48,20 @@ on_handle_set_hostname(Locale1 *hn1_passed_interf,
 const gchar *
 our_get_hostname() {
 
-       gchar *hostname_buf, *ret;
-       size_t hostname_divider;
+    gchar *hostname_buf, *ret;
+    size_t hostname_divider;
 
-       hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       g_ptr_array_add(localed_freeable, hostname_buf);
-       g_ptr_array_add(localed_freeable, ret);
+    hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    g_ptr_array_add(localed_freeable, hostname_buf);
+    g_ptr_array_add(localed_freeable, ret);
 
-       if(gethostname(hostname_buf, MAXHOSTNAMELEN))
-               return "";
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+        return "";
 
-       hostname_divider = strcspn(hostname_buf, ".");
+    hostname_divider = strcspn(hostname_buf, ".");
 
-       return strncpy(ret, hostname_buf, hostname_divider);
+    return strncpy(ret, hostname_buf, hostname_divider);
 }*/
 
 /* --- end method/property/dbus signal code, begin bus/name handlers --- */
@@ -96,23 +96,23 @@ static void localed_on_bus_acquired(GDBusConnection *conn,
 }
 
 static void localed_on_name_acquired(GDBusConnection *conn,
-                                        const gchar *name,
+                                     const gchar *name,
                                      gpointer user_data) {
 
-       g_printf("success!\n");
+    g_printf("success!\n");
 }
 
 static void localed_on_name_lost(GDBusConnection *conn,
                                    const gchar *name,
                                    gpointer user_data) {
 
-       if(!conn) {
+    if(!conn) {
 
-               g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
-               localed_mem_clean();
-       }
+        g_printf("failed to connect to the system bus while trying to acquire name '%s': either dbus-daemon isn't running or we don't have permission to push names and/or their interfaces to it.\n", name);
+        localed_mem_clean();
+    }
 
-       g_print("lost name %s, exiting...\n", name);
+    g_print("lost name %s, exiting...\n", name);
 
     localed_mem_clean();
 }
@@ -123,23 +123,23 @@ static void localed_on_name_lost(GDBusConnection *conn,
  * this stops our GMainLoop safely before letting main() return */
 void localed_mem_clean() {
 
-       g_printf("exiting...\n");
+    g_printf("exiting...\n");
 
-       if(dbus_interface_exported)
-               g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
+    if(dbus_interface_exported)
+        g_dbus_interface_skeleton_unexport(G_DBUS_INTERFACE_SKELETON(localed_interf));
 
-       if(g_main_loop_is_running(localed_loop))
-               g_main_loop_quit(localed_loop);
+    if(g_main_loop_is_running(localed_loop))
+        g_main_loop_quit(localed_loop);
 
 }
 
 /* wrapper for glib's unix signal handling; called only once if terminating signal is raised against us */
 gboolean unix_sig_terminate_handler(gpointer data) {
 
-       g_printf("caught SIGINT/HUP/TERM, exiting\n");
+    g_printf("caught SIGINT/HUP/TERM, exiting\n");
 
-       localed_mem_clean();
-       return G_SOURCE_REMOVE;
+    localed_mem_clean();
+    return G_SOURCE_REMOVE;
 }
 
 void set_signal_handlers() {
@@ -152,12 +152,12 @@ void set_signal_handlers() {
 
 int main() {
 
-       set_signal_handlers();
+    set_signal_handlers();
 
-       localed_loop = g_main_loop_new(NULL, TRUE);
-       localed_freeable = g_ptr_array_new();
+    localed_loop = g_main_loop_new(NULL, TRUE);
+    localed_freeable = g_ptr_array_new();
 
-        bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.locale1",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
                                     localed_on_bus_acquired,
@@ -166,15 +166,15 @@ int main() {
                                     NULL,
                                     NULL);
 
-       g_main_loop_run(localed_loop);
-       /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
-       g_main_loop_unref(localed_loop);
+    g_main_loop_run(localed_loop);
+    /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
+    g_main_loop_unref(localed_loop);
 
-       /* guaranteed unownable */
-       g_bus_unown_name(bus_descriptor);
+    /* guaranteed unownable */
+    g_bus_unown_name(bus_descriptor);
 
-       /* at this point no operations can occur with our data, it is safe to free it + its container */
-       g_ptr_array_free(localed_freeable, TRUE);
+    /* at this point no operations can occur with our data, it is safe to free it + its container */
+    g_ptr_array_free(localed_freeable, TRUE);
 
-       return 0;
+    return 0;
 }
index f005eef670003364f62510a374ce2080a414d0b9..7d887b6b9d6adb9f6e556566516c3ba176c34999 100644 (file)
@@ -48,20 +48,20 @@ on_handle_set_hostname(Login1Manager *hn1_passed_interf,
 /*const gchar *
 our_get_hostname() {
 
-       gchar *hostname_buf, *ret;
-       size_t hostname_divider;
+    gchar *hostname_buf, *ret;
+    size_t hostname_divider;
 
-       hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       g_ptr_array_add(logind_freeable, hostname_buf);
-       g_ptr_array_add(logind_freeable, ret);
+    hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    g_ptr_array_add(logind_freeable, hostname_buf);
+    g_ptr_array_add(logind_freeable, ret);
 
-       if(gethostname(hostname_buf, MAXHOSTNAMELEN))
-               return "";
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+        return "";
 
-       hostname_divider = strcspn(hostname_buf, ".");
+    hostname_divider = strcspn(hostname_buf, ".");
 
-       return strncpy(ret, hostname_buf, hostname_divider);
+    return strncpy(ret, hostname_buf, hostname_divider);
 }*/
 
 /* --- end method/property/dbus signal code, begin bus/name handlers --- */
@@ -96,7 +96,7 @@ static void logind_on_bus_acquired(GDBusConnection *conn,
 }
 
 static void logind_on_name_acquired(GDBusConnection *conn,
-                                       const gchar *name,
+                                    const gchar *name,
                                     gpointer user_data) {
 
    g_printf("success!\n");
@@ -154,10 +154,10 @@ int main() {
 
     set_signal_handlers();
 
-       logind_loop = g_main_loop_new(NULL, TRUE);
-       logind_freeable = g_ptr_array_new();
+    logind_loop = g_main_loop_new(NULL, TRUE);
+    logind_freeable = g_ptr_array_new();
 
-        bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.login1_manager",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
                                     logind_on_bus_acquired,
@@ -166,16 +166,16 @@ int main() {
                                     NULL,
                                     NULL);
 
-       g_main_loop_run(logind_loop);
+    g_main_loop_run(logind_loop);
     /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
-       g_main_loop_unref(logind_loop);
+    g_main_loop_unref(logind_loop);
 
     /* guaranteed unownable */
-       g_bus_unown_name(bus_descriptor);
+    g_bus_unown_name(bus_descriptor);
 
     /* at this point no operations can occur with our data, it is safe to free it + its container */
      g_ptr_array_free(logind_freeable, TRUE);
 
 
-       return 0;
+    return 0;
 }
index ee6cbeb68e1886aa4fe821d35a2a14a36e697f71..4dd2dba0fba24ca1948dc444ed2e845f31d6e477 100644 (file)
@@ -48,20 +48,20 @@ on_handle_set_hostname(Timedate1 *hn1_passed_interf,
 /*const gchar *
 our_get_hostname() {
 
-       gchar *hostname_buf, *ret;
-       size_t hostname_divider;
+    gchar *hostname_buf, *ret;
+    size_t hostname_divider;
 
-       hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
-       g_ptr_array_add(timedated_freeable, hostname_buf);
-       g_ptr_array_add(timedated_freeable, ret);
+    hostname_buf = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    ret          = (gchar*) g_malloc0(MAXHOSTNAMELEN);
+    g_ptr_array_add(timedated_freeable, hostname_buf);
+    g_ptr_array_add(timedated_freeable, ret);
 
-       if(gethostname(hostname_buf, MAXHOSTNAMELEN))
-               return "";
+    if(gethostname(hostname_buf, MAXHOSTNAMELEN))
+        return "";
 
-       hostname_divider = strcspn(hostname_buf, ".");
+    hostname_divider = strcspn(hostname_buf, ".");
 
-       return strncpy(ret, hostname_buf, hostname_divider);
+    return strncpy(ret, hostname_buf, hostname_divider);
 }*/
 
 /* --- end method/property/dbus signal code, begin bus/name handlers --- */
@@ -96,7 +96,7 @@ static void timedated_on_bus_acquired(GDBusConnection *conn,
 }
 
 static void timedated_on_name_acquired(GDBusConnection *conn,
-                                          const gchar *name,
+                                       const gchar *name,
                                        gpointer user_data) {
 
    g_printf("success!\n"); 
@@ -154,10 +154,10 @@ int main() {
 
     set_signal_handlers();
 
-       timedated_loop = g_main_loop_new(NULL, TRUE);
-       timedated_freeable = g_ptr_array_new();
+    timedated_loop = g_main_loop_new(NULL, TRUE);
+    timedated_freeable = g_ptr_array_new();
 
-        bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
+     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.timedate1",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
                                     timedated_on_bus_acquired,
@@ -166,15 +166,15 @@ int main() {
                                     NULL,
                                     NULL);
 
-       g_main_loop_run(timedated_loop);
+    g_main_loop_run(timedated_loop);
     /* runs until single g_main_loop_quit() call is raised inside <interface>_mem_clean() */
-       g_main_loop_unref(timedated_loop);
+    g_main_loop_unref(timedated_loop);
 
     /* guaranteed unownable */
-       g_bus_unown_name(bus_descriptor);
+    g_bus_unown_name(bus_descriptor);
 
     /* at this point no operations can occur with our data, it is safe to free it + its container */
     g_ptr_array_free(timedated_freeable, TRUE);
 
-       return 0;
+    return 0;
 }
index 0fcd7599924e8c4fc6b0a96ae480fa1ae0b1344e..346d87e7fe5bc877c37f8f95909bbd60c5c703d7 100644 (file)
 
 int main() {
 
-       GMainLoop *mloop;               
-       mloop = g_main_loop_new(NULL, TRUE);
-       
-       g_main_loop_run(mloop);
-       g_main_loop_unref(mloop);
+    GMainLoop *mloop;        
+    mloop = g_main_loop_new(NULL, TRUE);
+    
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
 
-       return 0;
+    return 0;
 }