Rename spawn-ask-password-agent.c to just ask-password-agent.c

The functions in the file were *not* using the spawn prefix,
and the prefix seems completely unnecessary.

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index f49927ae85448337d797c8e3ce867ad017525786..d79282f03f404916d26d24909845c28d90626015 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -14,6 +14,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "ask-password-agent.h"
 #include "build.h"
 #include "build-path.h"
 #include "bus-common-errors.h"
@@ -55,7 +56,6 @@
 #include "sigbus.h"
 #include "signal-util.h"
 #include "sort-util.h"
-#include "spawn-ask-password-agent.h"
 #include "stdio-util.h"
 #include "string-table.h"
 #include "strv.h"

diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/ask-password-agent.c
similarity index 97%
rename from src/shared/spawn-ask-password-agent.c
rename to src/shared/ask-password-agent.c
index d34cfffa839a2165ab060cc109f4b0ab0b1100f1..75eaa46254261a3ca250b4482a0136bee0b2a556 100644 (file)
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/ask-password-agent.c
@@ -4,10 +4,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "ask-password-agent.h"
 #include "exec-util.h"
 #include "log.h"
 #include "process-util.h"
-#include "spawn-ask-password-agent.h"
 
 static pid_t agent_pid = 0;
 

diff --git a/src/shared/spawn-ask-password-agent.h b/src/shared/ask-password-agent.h
similarity index 100%
rename from src/shared/spawn-ask-password-agent.h
rename to src/shared/ask-password-agent.h

diff --git a/src/shared/main-func.h b/src/shared/main-func.h
index 0dd0821ea6fef3310022f7747195afaf0170aff3..67537555a12eaac1ebe2f9b07d4a85700dc39deb 100644 (file)
--- a/src/shared/main-func.h
+++ b/src/shared/main-func.h
@@ -10,12 +10,12 @@
 #include "sd-daemon.h"
 
 #include "argv-util.h"
+#include "ask-password-agent.h"
 #include "hashmap.h"
 #include "pager.h"
 #include "polkit-agent.h"
 #include "selinux-util.h"
 #include "signal-util.h"
-#include "spawn-ask-password-agent.h"
 #include "static-destruct.h"
 
 #define _DEFINE_MAIN_FUNCTION(intro, impl, result_to_exit_status, result_to_return_value) \

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 1385172fe8f512fb91a14bfc259408a8fcaf2598..d474757fb09a64ff485aefdd1349e9a47473ae55 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -4,6 +4,7 @@ shared_sources = files(
         'acl-util.c',
         'acpi-fpdt.c',
         'apparmor-util.c',
+        'ask-password-agent.c',
         'ask-password-api.c',
         'async.c',
         'barrier.c',
@@ -160,7 +161,6 @@ shared_sources = files(
         'smbios11.c',
         'socket-label.c',
         'socket-netlink.c',
-        'spawn-ask-password-agent.c',
         'specifier.c',
         'switch-root.c',
         'tmpfile-util-label.c',

diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index 8e665d601536dd9a07a78b68698edf3f8f62bbf3..a73fc3afd0c50a8a52c19bbecf54f65ca38dcb61 100644 (file)
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -6,6 +6,7 @@
 #include "sd-bus.h"
 #include "sd-daemon.h"
 
+#include "ask-password-agent.h"
 #include "bus-common-errors.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
@@ -23,7 +24,6 @@
 #include "process-util.h"
 #include "reboot-util.h"
 #include "set.h"
-#include "spawn-ask-password-agent.h"
 #include "stat-util.h"
 #include "systemctl-util.h"
 #include "systemctl.h"