diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-07-10 17:03:11 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-07-10 17:07:32 +0200 |
| commit | 5f73969991fa765f2826975c0fc5e47438b5e9ea (patch) | |
| tree | bd9c5e438951fe0a584f1ad1b88897ceebe8a60a /src/shared/install.c | |
| parent | 0bf07cb5e4db097fcc25784b491fc4311d20fff2 (diff) | |
unit-name: remove unit_name_is_valid_no_type() and move unit_name_is_valid() to unit-name.h
Diffstat (limited to 'src/shared/install.c')
| -rw-r--r-- | src/shared/install.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 13ae9a976f..a3b75243d5 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -608,7 +608,7 @@ int unit_file_mask( STRV_FOREACH(i, files) { char *path; - if (!unit_name_is_valid_no_type(*i, true)) { + if (!unit_name_is_valid(*i, true)) { if (r == 0) r = -EINVAL; continue; @@ -684,7 +684,7 @@ int unit_file_unmask( STRV_FOREACH(i, files) { char *path; - if (!unit_name_is_valid_no_type(*i, true)) { + if (!unit_name_is_valid(*i, true)) { if (r == 0) r = -EINVAL; continue; @@ -760,7 +760,7 @@ int unit_file_link( fn = path_get_file_name(*i); if (!path_is_absolute(*i) || - !unit_name_is_valid_no_type(fn, true)) { + !unit_name_is_valid(fn, true)) { if (r == 0) r = -EINVAL; continue; @@ -923,7 +923,7 @@ static int install_info_add( if (!name) name = path_get_file_name(path); - if (!unit_name_is_valid_no_type(name, true)) + if (!unit_name_is_valid(name, true)) return -EINVAL; if (hashmap_get(c->have_installed, name) || @@ -1233,7 +1233,7 @@ static int install_info_symlink_wants( STRV_FOREACH(s, i->wanted_by) { char *path; - if (!unit_name_is_valid_no_type(*s, true)) { + if (!unit_name_is_valid(*s, true)) { r = -EINVAL; continue; } @@ -1267,7 +1267,7 @@ static int install_info_symlink_requires( STRV_FOREACH(s, i->required_by) { char *path; - if (!unit_name_is_valid_no_type(*s, true)) { + if (!unit_name_is_valid(*s, true)) { r = -EINVAL; continue; } @@ -1598,7 +1598,7 @@ UnitFileState unit_file_get_state( if (root_dir && scope != UNIT_FILE_SYSTEM) return -EINVAL; - if (!unit_name_is_valid_no_type(name, true)) + if (!unit_name_is_valid(name, true)) return -EINVAL; r = lookup_paths_init_from_scope(&paths, scope); @@ -1793,7 +1793,7 @@ int unit_file_preset( STRV_FOREACH(i, files) { - if (!unit_name_is_valid_no_type(*i, true)) { + if (!unit_name_is_valid(*i, true)) { r = -EINVAL; goto finish; } @@ -1898,7 +1898,7 @@ int unit_file_get_list( if (ignore_file(de->d_name)) continue; - if (!unit_name_is_valid_no_type(de->d_name, true)) + if (!unit_name_is_valid(de->d_name, true)) continue; if (hashmap_get(h, de->d_name)) |