Rename def.h to constants.h

The name "def.h" originates from before the rule of "no needless abbreviations"
was established. Let's rename the file to clarify that it contains a collection
of various semi-related constants.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-11-07 14:59:58 +01:00
parent db62f51a9f
commit 28db6fbff1
75 changed files with 98 additions and 97 deletions

View file

@ -3,7 +3,7 @@
#include "analyze.h"
#include "analyze-cat-config.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "nulstr-util.h"
#include "path-util.h"
#include "pretty-print.h"

View file

@ -47,7 +47,7 @@
#include "capability-util.h"
#include "conf-files.h"
#include "copy.h"
#include "def.h"
#include "constants.h"
#include "exit-status.h"
#include "extract-word.h"
#include "fd-util.h"

View file

@ -7,7 +7,7 @@
#include "ask-password-api.h"
#include "build.h"
#include "def.h"
#include "constants.h"
#include "log.h"
#include "macro.h"
#include "main-func.h"

View file

@ -12,7 +12,7 @@
#include "alloc-util.h"
#include "cgroup-util.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "extract-word.h"
#include "fd-util.h"

View file

@ -9,7 +9,7 @@
#include <sys/statfs.h>
#include <sys/types.h>
#include "def.h"
#include "constants.h"
#include "set.h"
#define SYSTEMD_CGROUP_CONTROLLER_LEGACY "name=systemd"

View file

@ -7,7 +7,7 @@
#include "chase-symlinks.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "hashmap.h"

View file

@ -1,6 +1,30 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if !defined(HAS_FEATURE_MEMORY_SANITIZER)
# if defined(__has_feature)
# if __has_feature(memory_sanitizer)
# define HAS_FEATURE_MEMORY_SANITIZER 1
# endif
# endif
# if !defined(HAS_FEATURE_MEMORY_SANITIZER)
# define HAS_FEATURE_MEMORY_SANITIZER 0
# endif
#endif
#if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
# ifdef __SANITIZE_ADDRESS__
# define HAS_FEATURE_ADDRESS_SANITIZER 1
# elif defined(__has_feature)
# if __has_feature(address_sanitizer)
# define HAS_FEATURE_ADDRESS_SANITIZER 1
# endif
# endif
# if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
# define HAS_FEATURE_ADDRESS_SANITIZER 0
# endif
#endif
#define DEFAULT_TIMEOUT_USEC (90*USEC_PER_SEC)
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
#define DEFAULT_CONFIRM_USEC (30*USEC_PER_SEC)

View file

@ -10,7 +10,7 @@
#include <sys/mman.h>
#include <sys/stat.h>
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "env-util.h"
#include "fd-util.h"

View file

@ -9,32 +9,9 @@
#include <sys/sysmacros.h>
#include <sys/types.h>
#include "constants.h"
#include "macro-fundamental.h"
#if !defined(HAS_FEATURE_MEMORY_SANITIZER)
# if defined(__has_feature)
# if __has_feature(memory_sanitizer)
# define HAS_FEATURE_MEMORY_SANITIZER 1
# endif
# endif
# if !defined(HAS_FEATURE_MEMORY_SANITIZER)
# define HAS_FEATURE_MEMORY_SANITIZER 0
# endif
#endif
#if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
# ifdef __SANITIZE_ADDRESS__
# define HAS_FEATURE_ADDRESS_SANITIZER 1
# elif defined(__has_feature)
# if __has_feature(address_sanitizer)
# define HAS_FEATURE_ADDRESS_SANITIZER 1
# endif
# endif
# if !defined(HAS_FEATURE_ADDRESS_SANITIZER)
# define HAS_FEATURE_ADDRESS_SANITIZER 0
# endif
#endif
/* Note: on GCC "no_sanitize_address" is a function attribute only, on llvm it may also be applied to global
* variables. We define a specific macro which knows this. Note that on GCC we don't need this decorator so much, since
* our primary usecase for this attribute is registration structures placed in named ELF sections which shall not be

View file

@ -33,7 +33,7 @@ basic_sources = files(
'chattr-util.h',
'conf-files.c',
'conf-files.h',
'def.h',
'constants.h',
'devnum-util.c',
'devnum-util.h',
'dirent-util.c',

View file

@ -3,7 +3,7 @@
#include <stdbool.h>
#include "def.h"
#include "constants.h"
#include "macro.h"
typedef enum LookupPathsFlags {

View file

@ -4,7 +4,7 @@
#include <unistd.h>
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "fd-util.h"
#include "fileio.h"
#include "parse-util.h"

View file

@ -21,7 +21,7 @@
#include <unistd.h>
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "devnum-util.h"
#include "env-util.h"
#include "fd-util.h"

View file

@ -13,7 +13,7 @@
#include "binfmt-util.h"
#include "build.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "fd-util.h"
#include "fileio.h"
#include "log.h"

View file

@ -48,10 +48,10 @@
#include "cgroup-setup.h"
#include "chase-symlinks.h"
#include "chown-recursive.h"
#include "constants.h"
#include "cpu-set-util.h"
#include "creds-util.h"
#include "data-fd-util.h"
#include "def.h"
#include "env-file.h"
#include "env-util.h"
#include "errno-list.h"

View file

@ -37,7 +37,7 @@
#include "crash-handler.h"
#include "dbus-manager.h"
#include "dbus.h"
#include "def.h"
#include "constants.h"
#include "dev-setup.h"
#include "efi-random.h"
#include "efivars.h"

View file

@ -30,13 +30,13 @@
#include "bus-util.h"
#include "clean-ipc.h"
#include "clock-util.h"
#include "constants.h"
#include "core-varlink.h"
#include "creds-util.h"
#include "dbus-job.h"
#include "dbus-manager.h"
#include "dbus-unit.h"
#include "dbus.h"
#include "def.h"
#include "dirent-util.h"
#include "env-util.h"
#include "escape.h"

View file

@ -13,9 +13,9 @@
#include "bus-kernel.h"
#include "bus-util.h"
#include "chase-symlinks.h"
#include "constants.h"
#include "dbus-service.h"
#include "dbus-unit.h"
#include "def.h"
#include "env-util.h"
#include "escape.h"
#include "exit-status.h"

View file

@ -15,10 +15,10 @@
#include "bus-error.h"
#include "bus-util.h"
#include "chase-symlinks.h"
#include "constants.h"
#include "copy.h"
#include "dbus-socket.h"
#include "dbus-unit.h"
#include "def.h"
#include "errno-list.h"
#include "exit-status.h"
#include "fd-util.h"

View file

@ -17,7 +17,7 @@
#include "bus-util.h"
#include "chase-symlinks.h"
#include "compress.h"
#include "def.h"
#include "constants.h"
#include "dissect-image.h"
#include "fd-util.h"
#include "format-table.h"

View file

@ -3,7 +3,7 @@
#include "sd-path.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "env-file.h"
#include "escape.h"
#include "glyph-util.h"

View file

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "home-util.h"
#include "homed-conf.h"

View file

@ -11,7 +11,7 @@
#include "bus-get-properties.h"
#include "bus-log-control-api.h"
#include "bus-polkit.h"
#include "def.h"
#include "constants.h"
#include "env-file-label.h"
#include "env-file.h"
#include "env-util.h"

View file

@ -10,7 +10,7 @@
#include "bus-get-properties.h"
#include "bus-log-control-api.h"
#include "bus-polkit.h"
#include "def.h"
#include "constants.h"
#include "env-util.h"
#include "fd-util.h"
#include "float.h"

View file

@ -14,8 +14,8 @@
#include "alloc-util.h"
#include "bus-error.h"
#include "bus-util.h"
#include "constants.h"
#include "daemon-util.h"
#include "def.h"
#include "fd-util.h"
#include "format-util.h"
#include "initreq.h"

View file

@ -7,8 +7,8 @@
#include "build.h"
#include "conf-parser.h"
#include "constants.h"
#include "daemon-util.h"
#include "def.h"
#include "fd-util.h"
#include "fileio.h"
#include "journal-remote-write.h"

View file

@ -10,7 +10,7 @@
#include "af-list.h"
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "errno-util.h"
#include "escape.h"
#include "fd-util.h"

View file

@ -12,8 +12,8 @@
#include "alloc-util.h"
#include "build.h"
#include "conf-parser.h"
#include "constants.h"
#include "daemon-util.h"
#include "def.h"
#include "env-file.h"
#include "fd-util.h"
#include "fileio.h"

View file

@ -25,7 +25,7 @@
#include "catalog.h"
#include "chase-symlinks.h"
#include "chattr-util.h"
#include "def.h"
#include "constants.h"
#include "dissect-image.h"
#include "fd-util.h"
#include "fileio.h"

View file

@ -8,7 +8,7 @@
#include "bus-error.h"
#include "bus-kernel.h"
#include "bus-match.h"
#include "def.h"
#include "constants.h"
#include "hashmap.h"
#include "list.h"
#include "prioq.h"

View file

@ -27,7 +27,7 @@
#include "bus-track.h"
#include "bus-type.h"
#include "cgroup-util.h"
#include "def.h"
#include "constants.h"
#include "errno-util.h"
#include "fd-util.h"
#include "glyph-util.h"

View file

@ -8,7 +8,7 @@
#include "alloc-util.h"
#include "bus-internal.h"
#include "bus-kernel.h"
#include "def.h"
#include "constants.h"
#include "fd-util.h"
#include "missing_resource.h"
#include "string-util.h"

View file

@ -4,7 +4,7 @@
#include <stdint.h>
#include <sys/stat.h>
#include "def.h"
#include "constants.h"
#include "hashmap.h"
#include "sparse-endian.h"

View file

@ -17,7 +17,7 @@
#include "bus-log-control-api.h"
#include "bus-message.h"
#include "bus-polkit.h"
#include "def.h"
#include "constants.h"
#include "dlfcn-util.h"
#include "kbd-util.h"
#include "localed-util.h"

View file

@ -14,8 +14,8 @@
#include "bus-log-control-api.h"
#include "bus-polkit.h"
#include "cgroup-util.h"
#include "constants.h"
#include "daemon-util.h"
#include "def.h"
#include "device-util.h"
#include "dirent-util.h"
#include "fd-util.h"

View file

@ -25,8 +25,8 @@
#include "bus-wait-for-jobs.h"
#include "cgroup-show.h"
#include "cgroup-util.h"
#include "constants.h"
#include "copy.h"
#include "def.h"
#include "env-util.h"
#include "fd-util.h"
#include "format-table.h"

View file

@ -7,7 +7,7 @@
#include "build.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "fd-util.h"
#include "fileio.h"
#include "log.h"

View file

@ -4,7 +4,7 @@
***/
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "networkd-conf.h"
#include "networkd-manager.h"
#include "networkd-speed-meter.h"

View file

@ -17,8 +17,8 @@
#include "bus-polkit.h"
#include "bus-util.h"
#include "conf-parser.h"
#include "constants.h"
#include "daemon-util.h"
#include "def.h"
#include "device-private.h"
#include "device-util.h"
#include "dns-domain.h"

View file

@ -5,7 +5,7 @@
#include <unistd.h>
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "errno.h"
#include "fd-util.h"
#include "fileio.h"

View file

@ -7,7 +7,7 @@
#include <unistd.h>
#include "argv-util.h"
#include "def.h"
#include "constants.h"
#include "exit-status.h"
#include "fd-util.h"
#include "log.h"

View file

@ -23,8 +23,8 @@
#include "chase-symlinks.h"
#include "conf-files.h"
#include "conf-parser.h"
#include "constants.h"
#include "cryptsetup-util.h"
#include "def.h"
#include "device-util.h"
#include "devnum-util.h"
#include "dirent-util.h"

View file

@ -8,7 +8,7 @@
#include "conf-files.h"
#include "copy.h"
#include "data-fd-util.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "discover-image.h"
#include "dissect-image.h"

View file

@ -12,7 +12,7 @@
#include "bus-unit-util.h"
#include "bus-wait-for-jobs.h"
#include "chase-symlinks.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "env-file.h"
#include "fd-util.h"

View file

@ -8,8 +8,8 @@
#include "alloc-util.h"
#include "bus-log-control-api.h"
#include "bus-polkit.h"
#include "constants.h"
#include "daemon-util.h"
#include "def.h"
#include "main-func.h"
#include "portabled-bus.h"
#include "portabled-image-bus.h"

View file

@ -5,7 +5,7 @@
#include "alloc-util.h"
#include "build.h"
#include "def.h"
#include "constants.h"
#include "dns-domain.h"
#include "extract-word.h"
#include "fileio.h"

View file

@ -2,7 +2,7 @@
#include "alloc-util.h"
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "extract-word.h"
#include "hexdecoct.h"
#include "parse-util.h"

View file

@ -4,7 +4,7 @@
#include "alloc-util.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "dns-domain.h"
#include "fd-util.h"
#include "fileio.h"

View file

@ -2,7 +2,7 @@
#include "conf-files.h"
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "resolved-dnssd.h"
#include "resolved-dns-rr.h"
#include "resolved-manager.h"

View file

@ -20,8 +20,8 @@
#include "alloc-util.h"
#include "ask-password-api.h"
#include "constants.h"
#include "creds-util.h"
#include "def.h"
#include "fd-util.h"
#include "fileio.h"
#include "format-util.h"

View file

@ -10,7 +10,7 @@
#include "alloc-util.h"
#include "conf-files.h"
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "dns-domain.h"
#include "escape.h"
#include "ether-addr-util.h"

View file

@ -10,8 +10,8 @@
#include "blockdev-util.h"
#include "chattr-util.h"
#include "constants.h"
#include "creds-util.h"
#include "def.h"
#include "efi-api.h"
#include "env-util.h"
#include "fd-util.h"

View file

@ -27,9 +27,9 @@
#include "blockdev-util.h"
#include "chase-symlinks.h"
#include "conf-files.h"
#include "constants.h"
#include "copy.h"
#include "cryptsetup-util.h"
#include "def.h"
#include "device-nodes.h"
#include "device-util.h"
#include "devnum-util.h"

View file

@ -13,7 +13,7 @@
#include "chase-symlinks.h"
#include "conf-files.h"
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "errno-list.h"
#include "extract-word.h"

View file

@ -9,7 +9,7 @@
#include <unistd.h>
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "fd-util.h"
#include "format-util.h"

View file

@ -6,7 +6,7 @@
#include "alloc-util.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "env-util.h"
#include "fd-util.h"
#include "fileio.h"

View file

@ -21,7 +21,7 @@
#include "blockdev-util.h"
#include "btrfs-util.h"
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "device-util.h"
#include "devnum-util.h"
#include "env-util.h"

View file

@ -1,8 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "constants.h"
#include "cryptsetup-util.h"
#include "def.h"
#include "dirent-util.h"
#include "dlfcn-util.h"
#include "efi-api.h"

View file

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "def.h"
#include "constants.h"
#include "group-record.h"
#include "user-record.h"
#include "userdb.h"

View file

@ -20,7 +20,7 @@
#include "cgroup-setup.h"
#include "cgroup-util.h"
#include "coredump-util.h"
#include "def.h"
#include "constants.h"
#include "errno-util.h"
#include "exec-util.h"
#include "fd-util.h"

View file

@ -23,7 +23,7 @@
#include "alloc-util.h"
#include "blockdev-util.h"
#include "def.h"
#include "constants.h"
#include "device-util.h"
#include "dirent-util.h"
#include "escape.h"

View file

@ -22,7 +22,7 @@
#include "bus-error.h"
#include "bus-locator.h"
#include "bus-util.h"
#include "def.h"
#include "constants.h"
#include "exec-util.h"
#include "fd-util.h"
#include "fileio.h"

View file

@ -11,7 +11,7 @@
#include "bus-locator.h"
#include "bus-util.h"
#include "bus-error.h"
#include "def.h"
#include "constants.h"
#include "env-util.h"
#include "log.h"
#include "process-util.h"

View file

@ -11,8 +11,8 @@
#include "build.h"
#include "conf-files.h"
#include "constants.h"
#include "creds-util.h"
#include "def.h"
#include "errno-util.h"
#include "fd-util.h"
#include "fileio.h"

View file

@ -8,7 +8,7 @@
#include "bus-locator.h"
#include "chase-symlinks.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "dissect-image.h"
#include "fd-util.h"

View file

@ -7,9 +7,9 @@
#include "build.h"
#include "chase-symlinks.h"
#include "conf-files.h"
#include "constants.h"
#include "copy.h"
#include "creds-util.h"
#include "def.h"
#include "dissect-image.h"
#include "env-util.h"
#include "fd-util.h"

View file

@ -3,7 +3,7 @@
#include <stdio.h>
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "string-util.h"
#include "strv.h"
#include "terminal-util.h"

View file

@ -7,7 +7,7 @@
#include "alloc-util.h"
#include "copy.h"
#include "def.h"
#include "constants.h"
#include "env-util.h"
#include "exec-util.h"
#include "fd-util.h"

View file

@ -5,7 +5,7 @@
#include <unistd.h>
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "fd-util.h"
#include "fileio.h"
#include "hashmap.h"

View file

@ -20,7 +20,7 @@
#include "bus-polkit.h"
#include "clock-util.h"
#include "conf-files.h"
#include "def.h"
#include "constants.h"
#include "fd-util.h"
#include "fileio-label.h"
#include "fileio.h"

View file

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "alloc-util.h"
#include "def.h"
#include "constants.h"
#include "dns-domain.h"
#include "extract-word.h"
#include "string-util.h"

View file

@ -25,9 +25,9 @@
#include "chase-symlinks.h"
#include "chattr-util.h"
#include "conf-files.h"
#include "constants.h"
#include "copy.h"
#include "creds-util.h"
#include "def.h"
#include "devnum-util.h"
#include "dirent-util.h"
#include "dissect-image.h"

View file

@ -20,7 +20,7 @@
#include "ask-password-api.h"
#include "build.h"
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "dirent-util.h"
#include "exit-status.h"
#include "fd-util.h"

View file

@ -11,8 +11,8 @@
#include "arphrd-util.h"
#include "conf-files.h"
#include "conf-parser.h"
#include "constants.h"
#include "creds-util.h"
#include "def.h"
#include "device-private.h"
#include "device-util.h"
#include "ethtool-util.h"

View file

@ -6,7 +6,7 @@
#include "architecture.h"
#include "conf-files.h"
#include "conf-parser.h"
#include "def.h"
#include "constants.h"
#include "device-private.h"
#include "device-util.h"
#include "dirent-util.h"