picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

install: move and rename to lowercase two functions

Browse source 
No reason to make them look like macros.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-09-21 18:36:45 +02:00
parent 3ec530a189
commit 7a7ec2bf71
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/shared/install.c
View file

@ -83,6 +83,20 @@ typedef struct {
size_t n_rules;
} Presets;
static inline bool unit_file_install_info_has_rules(UnitFileInstallInfo *i) {
assert(i);
return !strv_isempty(i->aliases) ||
!strv_isempty(i->wanted_by) ||
!strv_isempty(i->required_by);
}
static inline bool unit_file_install_info_has_also(UnitFileInstallInfo *i) {
assert(i);
return !strv_isempty(i->also);
}
static inline void presets_freep(Presets *p) {
size_t i;
@ -2593,9 +2607,9 @@ static int unit_file_lookup_state(
if (r < 0)
return r;
if (r == 0) {
if (UNIT_FILE_INSTALL_INFO_HAS_RULES(i))
if (unit_file_install_info_has_rules(i))
state = UNIT_FILE_DISABLED;
else if (UNIT_FILE_INSTALL_INFO_HAS_ALSO(i))
else if (unit_file_install_info_has_also(i))
state = UNIT_FILE_INDIRECT;
else
state = UNIT_FILE_STATIC;

14
src/shared/install.h
View file

@ -132,20 +132,6 @@ struct UnitFileInstallInfo {
bool auxiliary;
};
static inline bool UNIT_FILE_INSTALL_INFO_HAS_RULES(UnitFileInstallInfo *i) {
assert(i);
return !strv_isempty(i->aliases) ||
!strv_isempty(i->wanted_by) ||
!strv_isempty(i->required_by);
}
static inline bool UNIT_FILE_INSTALL_INFO_HAS_ALSO(UnitFileInstallInfo *i) {
assert(i);
return !strv_isempty(i->also);
}
bool unit_type_may_alias(UnitType type) _const_;
bool unit_type_may_template(UnitType type) _const_;