From a8c3ed5f130ac6b9526b635448f2f29751d59603 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 26 Jun 2024 12:07:36 +0200
Subject: [PATCH] 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.
---
 src/machine/machinectl.c                                        | 2 +-
 src/shared/{spawn-ask-password-agent.c => ask-password-agent.c} | 2 +-
 src/shared/{spawn-ask-password-agent.h => ask-password-agent.h} | 0
 src/shared/main-func.h                                          | 2 +-
 src/shared/meson.build                                          | 2 +-
 src/systemctl/systemctl-util.c                                  | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/shared/{spawn-ask-password-agent.c => ask-password-agent.c} (97%)
 rename src/shared/{spawn-ask-password-agent.h => ask-password-agent.h} (100%)

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index f49927ae854..d79282f03f4 100644
--- 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 d34cfffa839..75eaa462542 100644
--- 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 0dd0821ea6f..67537555a12 100644
--- 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 1385172fe8f..d474757fb09 100644
--- 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 8e665d60153..a73fc3afd0c 100644
--- 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"
-- 
2.47.3