daemon: Rename all the things!

Use 'rpmostreed' as the symbol prefix.
coreos · Aug 25, 2015 · 8d6cbf2 · 8d6cbf2
1 parent b3c0e40
commit 8d6cbf2
Show file tree

Hide file tree

Showing 28 changed files with 974 additions and 965 deletions.
diff --git a/Makefile-daemon.am b/Makefile-daemon.am
@@ -19,26 +19,27 @@ noinst_LTLIBRARIES += librpmostreed.la
 nodist_librpmostreed_la_SOURCES = $(dbus_built_sources)
 
 librpmostreed_la_SOURCES = \
-	src/daemon/daemon.h \
-	src/daemon/daemon.c \
-	src/daemon/utils.h \
-	src/daemon/utils.c \
-	src/daemon/sysroot.h \
-	src/daemon/sysroot.c \
-	src/daemon/errors.h \
-	src/daemon/errors.c \
-	src/daemon/deployment-utils.h \
-	src/daemon/deployment-utils.c \
-	src/daemon/transaction.h \
-	src/daemon/transaction.c \
-	src/daemon/transaction-monitor.h \
-	src/daemon/transaction-monitor.c \
-	src/daemon/transaction-types.h \
-	src/daemon/transaction-types.c \
+	src/daemon/rpmostreed-types.h \
+	src/daemon/rpmostreed-daemon.h \
+	src/daemon/rpmostreed-daemon.c \
+	src/daemon/rpmostreed-utils.h \
+	src/daemon/rpmostreed-utils.c \
+	src/daemon/rpmostreed-sysroot.h \
+	src/daemon/rpmostreed-sysroot.c \
+	src/daemon/rpmostreed-errors.h \
+	src/daemon/rpmostreed-errors.c \
+	src/daemon/rpmostreed-deployment-utils.h \
+	src/daemon/rpmostreed-deployment-utils.c \
+	src/daemon/rpmostreed-transaction.h \
+	src/daemon/rpmostreed-transaction.c \
+	src/daemon/rpmostreed-transaction-monitor.h \
+	src/daemon/rpmostreed-transaction-monitor.c \
+	src/daemon/rpmostreed-transaction-types.h \
+	src/daemon/rpmostreed-transaction-types.c \
 	src/daemon/rpmostree-package-variants.h \
 	src/daemon/rpmostree-package-variants.c \
-	src/daemon/os.h \
-	src/daemon/os.c \
+	src/daemon/rpmostreed-os.h \
+	src/daemon/rpmostreed-os.c \
 	$(NULL)
 
 librpmostreed_la_CFLAGS = \

diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h
diff --git a/src/daemon/deployment-utils.h b/src/daemon/deployment-utils.h
diff --git a/src/daemon/main.c b/src/daemon/main.c
@@ -16,8 +16,11 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
+
 #include "config.h"
-#include "daemon.h"
+
+#include "rpmostreed-daemon.h"
+
 #include <glib/gi18n.h>
 #include <glib-unix.h>
 #include <gio/gio.h>
@@ -37,10 +40,10 @@ static GOptionEntry opt_entries[] =
   {NULL }
 };
 
-static Daemon *rpm_ostree_daemon = NULL;
+static RpmostreedDaemon *rpm_ostree_daemon = NULL;
 
 static void
-on_close (Daemon *daemon, gpointer data)
+on_close (RpmostreedDaemon *daemon, gpointer data)
 {
   g_main_loop_quit (loop);
 }
@@ -51,7 +54,8 @@ start_daemon (GDBusConnection *connection,
 {
   GError *local_error = NULL;
 
-  rpm_ostree_daemon = g_initable_new (TYPE_DAEMON, NULL, &local_error,
+  rpm_ostree_daemon = g_initable_new (RPMOSTREED_TYPE_DAEMON,
+                                      NULL, &local_error,
                                       "connection", connection,
                                       "sysroot-path", opt_sysroot,
                                       "on-message-bus", on_messsage_bus,
@@ -63,7 +67,7 @@ start_daemon (GDBusConnection *connection,
       g_assert_not_reached ();
     }
 
-  daemon_hold (rpm_ostree_daemon);
+  rpmostreed_daemon_hold (rpm_ostree_daemon);
 
   g_signal_connect (rpm_ostree_daemon, "finished",
                     G_CALLBACK (on_close), NULL);
@@ -102,7 +106,7 @@ on_name_lost (GDBusConnection *connection,
     }
   else
     {
-      daemon_release (rpm_ostree_daemon);
+      rpmostreed_daemon_release (rpm_ostree_daemon);
     }
 }