From 178a71d970b2c093e8a72bb34fc24654dab95bbe Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Wed, 1 May 2024 17:09:52 +0800 Subject: [PATCH] unit-file,portable: replace streq + basename with path_equal_filename --- src/basic/unit-file.c | 2 +- src/portable/portabled-image-bus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c index 54f2137a366..ca2686b2099 100644 --- a/src/basic/unit-file.c +++ b/src/basic/unit-file.c @@ -699,7 +699,7 @@ static int add_names( if (inst_fragment && fragment_basename && - !streq(basename(inst_fragment), fragment_basename)) { + !path_equal_filename(inst_fragment, fragment_basename)) { log_debug("Instance %s has fragment %s and is not an alias of %s.", inst, inst_fragment, unit_name); continue; diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index 8db55742425..0ca04d3a0b9 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.c @@ -596,7 +596,7 @@ static int normalize_portable_changes( bool found = false; for (size_t j = 0; j < n_changes_attached; ++j) - if (streq(basename(changes_detached[i].path), basename(changes_attached[j].path))) { + if (path_equal_filename(changes_detached[i].path, changes_attached[j].path)) { found = true; break; }