From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Sun, 25 May 2025 17:43:45 +0000 (+0200)
Subject: env-util: rename 'n' -> 'length'
X-Git-Tag: v258-rc1~414^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4f938aec1a094d5b071b7bec8ccaad56d392312;p=thirdparty%2Fsystemd.git

env-util: rename 'n' -> 'length'
---

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 7bdfdec8517..bbb6d5829b5 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -688,7 +688,7 @@ static int strv_env_get_n_validated(
 
 int replace_env_full(
                 const char *format,
-                size_t n,
+                size_t length,
                 char **env,
                 ReplaceEnvFlags flags,
                 char **ret,
@@ -714,13 +714,13 @@ int replace_env_full(
 
         assert(format);
 
-        if (n == SIZE_MAX)
-                n = strlen(format);
+        if (length == SIZE_MAX)
+                length = strlen(format);
 
         pu = ret_unset_variables ? &unset_variables : NULL;
         pb = ret_bad_variables ? &bad_variables : NULL;
 
-        for (e = format, i = 0; *e && i < n; e++, i++)
+        for (e = format, i = 0; *e && i < length; e++, i++)
                 switch (state) {
 
                 case WORD:
diff --git a/src/basic/env-util.h b/src/basic/env-util.h
index 6c25ca38048..9f55a91fffe 100644
--- a/src/basic/env-util.h
+++ b/src/basic/env-util.h
@@ -15,7 +15,7 @@ typedef enum ReplaceEnvFlags {
         REPLACE_ENV_ALLOW_EXTENDED  = 1 << 2,
 } ReplaceEnvFlags;
 
-int replace_env_full(const char *format, size_t n, char **env, ReplaceEnvFlags flags, char **ret, char ***ret_unset_variables, char ***ret_bad_variables);
+int replace_env_full(const char *format, size_t length, char **env, ReplaceEnvFlags flags, char **ret, char ***ret_unset_variables, char ***ret_bad_variables);
 static inline int replace_env(const char *format, char **env, ReplaceEnvFlags flags, char **ret) {
         return replace_env_full(format, SIZE_MAX, env, flags, ret, NULL, NULL);
 }