diff options
| author | Karel Zak <kzak@redhat.com> | 2025-06-26 13:47:00 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2025-06-26 13:49:37 +0200 |
| commit | f39ffccf2b9b8dcaaf2069346cc50735c2f0f95d (patch) | |
| tree | a858ce55b377a85bc8adbe071f4c7091a262d2ff /sys-utils/wdctl.c | |
| parent | ba5c614edc4407d5dacea6ce29c0a41f39883f02 (diff) | |
| download | util-linux-f39ffccf2b9b8dcaaf2069346cc50735c2f0f95d.tar.gz | |
lib/strv: use ul_ prefix for strv functions
The functions are originally from systemd/udev, so it's possible that
during static linking, they may collide with other systemd-based
components.
Fixes: https://github.com/util-linux/util-linux/issues/3626
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/wdctl.c')
| -rw-r--r-- | sys-utils/wdctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c index 9290eb3120..b3203d4611 100644 --- a/sys-utils/wdctl.c +++ b/sys-utils/wdctl.c @@ -594,7 +594,7 @@ static int read_governors(struct wd_device *wd) while ((sz = getline(&line, &dummy, f)) >= 0) { if (rtrim_whitespace((unsigned char *) line) == 0) continue; - strv_consume(&wd->available_governors, line); + ul_strv_consume(&wd->available_governors, line); dummy = 0; line = NULL; } @@ -663,7 +663,7 @@ static void show_governors(struct wd_device *wd) if (wd->governor) printf(_("%-14s %s\n"), _("Pre-timeout governor:"), wd->governor); if (wd->available_governors) { - char *tmp = strv_join(wd->available_governors, " "); + char *tmp = ul_strv_join(wd->available_governors, " "); if (tmp) printf(_("%-14s %s\n"), |