dbus-spawn-unix: Rename from dbus-spawn

This file is the Unix counterpart of dbus-spawn-win.c, so it's less
confusing for it to have an indicative name.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104588

diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
index 2fdd11282401764e7d75da6a37071f6881fdbe4a..8fdd4b94b8785093f52ee880d9651825780aad2e 100644 (file)
--- a/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@ -227,7 +227,7 @@ else (WIN32)
                ${DBUS_DIR}/dbus-userdb.h
        )
        set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
-               ${DBUS_DIR}/dbus-spawn.c
+               ${DBUS_DIR}/dbus-spawn-unix.c
                ${DBUS_DIR}/dbus-userdb-util.c
                ${DBUS_DIR}/dbus-sysdeps-util-unix.c
        )

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index d4fe09f89393b854c904110d634df6e48dcb1e3a..8f451f59cb3d2adb45af1135d56ccb3cd6f35d31 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -116,7 +116,7 @@ DBUS_SHARED_arch_sources =                  \
 DBUS_UTIL_arch_sources =                       \
        dbus-sysdeps-util-unix.c                \
        dbus-userdb-util.c                      \
-       dbus-spawn.c
+       dbus-spawn-unix.c                       \
 endif
 
 if HAVE_LINUX_EPOLL

diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index 126e3e4b73a31b90d470d658a6dbf62eb9bb6295..061c527bfc3f4385d10480f4faf4b0686148b2c4 100644 (file)
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -447,7 +447,7 @@ _dbus_verbose_real (
 
 /**
  * Reinitializes the verbose logging code, used
- * as a hack in dbus-spawn.c so that a child
+ * as a hack in dbus-spawn-unix.c so that a child
  * process re-reads its pid
  *
  */

diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn-unix.c
similarity index 99%
rename from dbus/dbus-spawn.c
rename to dbus/dbus-spawn-unix.c
index 6fb75d3b731cf8730b2dd40ed26f81e94bc326e1..cea5a5f1022e1e4bde906d3acfa09d88cbb2e609 100644 (file)
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn-unix.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-spawn.c Wrapper around fork/exec
+/* dbus-spawn-unix.c — Wrapper around fork/exec
  *
  * Copyright (C) 2002, 2003, 2004  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
@@ -24,9 +24,6 @@
 
 #include <config.h>
 
-/* It isn't obvious from its name, but this file is part of the Unix
- * system-dependent part of libdbus. Windows has a parallel
- * implementation in dbus-spawn-win.c. */
 #if defined(DBUS_WIN) || !defined(DBUS_UNIX)
 #error "This file only makes sense on Unix OSs"
 #endif