diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-01-15 14:14:29 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-01-15 18:34:56 +0000 |
| commit | 6e804baba495ea75423ca88d69f2fe487b3d9acc (patch) | |
| tree | d3c9db9d81fbfcc0add923fe45e9c80ab7581072 | |
| parent | d1738d079e599c726613e36a0095e5eb4c055bf4 (diff) | |
| download | dbus-6e804baba495ea75423ca88d69f2fe487b3d9acc.tar.gz | |
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
| -rw-r--r-- | cmake/dbus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | dbus/dbus-internals.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-spawn-unix.c (renamed from dbus/dbus-spawn.c) | 5 |
4 files changed, 4 insertions, 7 deletions
diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 2fdd1128..8fdd4b94 100644 --- 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 d4fe09f8..8f451f59 100644 --- 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 126e3e4b..061c527b 100644 --- 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 index 6fb75d3b..cea5a5f1 100644 --- 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 |