diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-11 13:50:08 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-11 21:02:34 +0200 |
| commit | 9a5893e9bbb86b4939ce6c4047fc4636329f5e7e (patch) | |
| tree | 756ff52d17c6bcc41cd20181a777cae0db5e8c0e /src/shared/specifier.h | |
| parent | 8b4679a68484a66b5a4e2766f4b0b176c8f0ed38 (diff) | |
| download | systemd-9a5893e9bbb86b4939ce6c4047fc4636329f5e7e.tar.gz | |
tree-wide: host_name → hostname
We use "hostname" exclusively in docs, and also in a big majority of the
code. Let's use the same spelling in remaining places.
Diffstat (limited to 'src/shared/specifier.h')
| -rw-r--r-- | src/shared/specifier.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/shared/specifier.h b/src/shared/specifier.h index ea37e3cef6..abde3d9ad2 100644 --- a/src/shared/specifier.h +++ b/src/shared/specifier.h @@ -19,9 +19,9 @@ int specifier_real_directory(char specifier, const void *data, const char *root, int specifier_machine_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); int specifier_boot_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); -int specifier_host_name(char specifier, const void *data, const char *root, const void *userdata, char **ret); -int specifier_short_host_name(char specifier, const void *data, const char *root, const void *userdata, char **ret); -int specifier_pretty_host_name(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_hostname(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_short_hostname(char specifier, const void *data, const char *root, const void *userdata, char **ret); +int specifier_pretty_hostname(char specifier, const void *data, const char *root, const void *userdata, char **ret); int specifier_kernel_release(char specifier, const void *data, const char *root, const void *userdata, char **ret); int specifier_architecture(char specifier, const void *data, const char *root, const void *userdata, char **ret); int specifier_os_id(char specifier, const void *data, const char *root, const void *userdata, char **ret); @@ -70,30 +70,30 @@ int specifier_var_tmp_dir(char specifier, const void *data, const char *root, co * %V: the temporary directory for large, persistent stuff (e.g. /var/tmp, or $TMPDIR, $TEMP, $TMP) */ -#define COMMON_SYSTEM_SPECIFIERS \ - { 'a', specifier_architecture, NULL }, \ - { 'A', specifier_os_image_version,NULL }, \ - { 'b', specifier_boot_id, NULL }, \ - { 'B', specifier_os_build_id, NULL }, \ - { 'H', specifier_host_name, NULL }, \ - { 'l', specifier_short_host_name, NULL }, \ - { 'q', specifier_pretty_host_name,NULL }, \ - { 'm', specifier_machine_id, NULL }, \ - { 'M', specifier_os_image_id, NULL }, \ - { 'o', specifier_os_id, NULL }, \ - { 'v', specifier_kernel_release, NULL }, \ - { 'w', specifier_os_version_id, NULL }, \ - { 'W', specifier_os_variant_id, NULL } +#define COMMON_SYSTEM_SPECIFIERS \ + { 'a', specifier_architecture, NULL }, \ + { 'A', specifier_os_image_version, NULL }, \ + { 'b', specifier_boot_id, NULL }, \ + { 'B', specifier_os_build_id, NULL }, \ + { 'H', specifier_hostname, NULL }, \ + { 'l', specifier_short_hostname, NULL }, \ + { 'q', specifier_pretty_hostname, NULL }, \ + { 'm', specifier_machine_id, NULL }, \ + { 'M', specifier_os_image_id, NULL }, \ + { 'o', specifier_os_id, NULL }, \ + { 'v', specifier_kernel_release, NULL }, \ + { 'w', specifier_os_version_id, NULL }, \ + { 'W', specifier_os_variant_id, NULL } -#define COMMON_CREDS_SPECIFIERS(scope) \ - { 'g', specifier_group_name, INT_TO_PTR(scope) }, \ - { 'G', specifier_group_id, INT_TO_PTR(scope) }, \ - { 'u', specifier_user_name, INT_TO_PTR(scope) }, \ - { 'U', specifier_user_id, INT_TO_PTR(scope) } +#define COMMON_CREDS_SPECIFIERS(scope) \ + { 'g', specifier_group_name, INT_TO_PTR(scope) }, \ + { 'G', specifier_group_id, INT_TO_PTR(scope) }, \ + { 'u', specifier_user_name, INT_TO_PTR(scope) }, \ + { 'U', specifier_user_id, INT_TO_PTR(scope) } -#define COMMON_TMP_SPECIFIERS \ - { 'T', specifier_tmp_dir, NULL }, \ - { 'V', specifier_var_tmp_dir, NULL } +#define COMMON_TMP_SPECIFIERS \ + { 'T', specifier_tmp_dir, NULL }, \ + { 'V', specifier_var_tmp_dir, NULL } static inline char* specifier_escape(const char *string) { return strreplace(string, "%", "%%"); |