From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Sat, 17 May 2025 13:32:52 +0000 (+0200)
Subject: core: rename p -> parameters
X-Git-Tag: v258-rc1~559^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6333b3b88d187009d9c1f43971a359d76393e440;p=thirdparty%2Fsystemd.git

core: rename p -> parameters
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 86f1be3e4fa..d6fbde04e4c 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -146,7 +146,7 @@ int exec_context_apply_tty_size(
         return terminal_set_size_fd(output_fd, tty_path, rows, cols);
 }
 
-void exec_context_tty_reset(const ExecContext *context, const ExecParameters *p, sd_id128_t invocation_id) {
+void exec_context_tty_reset(const ExecContext *context, const ExecParameters *parameters, sd_id128_t invocation_id) {
         _cleanup_close_ int _fd = -EBADF, lock_fd = -EBADF;
         int fd, r;
 
@@ -159,8 +159,8 @@ void exec_context_tty_reset(const ExecContext *context, const ExecParameters *p,
 
         const char *path = exec_context_tty_path(context);
 
-        if (p && p->stdout_fd >= 0 && isatty_safe(p->stdout_fd))
-                fd = p->stdout_fd;
+        if (parameters && parameters->stdout_fd >= 0 && isatty_safe(parameters->stdout_fd))
+                fd = parameters->stdout_fd;
         else if (path && (context->tty_path || is_terminal_input(context->std_input) ||
                         is_terminal_output(context->std_output) || is_terminal_output(context->std_error))) {
                 fd = _fd = open_terminal(path, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK);
diff --git a/src/core/execute.h b/src/core/execute.h
index 44c15707708..1bbaac3840c 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -551,7 +551,7 @@ int exec_context_get_clean_mask(ExecContext *c, ExecCleanMask *ret);
 
 const char* exec_context_tty_path(const ExecContext *context);
 int exec_context_apply_tty_size(const ExecContext *context, int input_fd, int output_fd, const char *tty_path);
-void exec_context_tty_reset(const ExecContext *context, const ExecParameters *p, sd_id128_t invocation_id);
+void exec_context_tty_reset(const ExecContext *context, const ExecParameters *parameters, sd_id128_t invocation_id);
 
 uint64_t exec_context_get_rlimit(const ExecContext *c, const char *name);
 int exec_context_get_oom_score_adjust(const ExecContext *c);