From 9971459d19e93ff652eeaff165da72e51b256299 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 24 Sep 2021 17:40:35 +0200 Subject: [PATCH] make: replace legacy use rindex with strrchr Seems already dropped by some systems. Reported-by: adamboardman of gemian --- device_mapper/libdm-deptree.c | 2 +- lib/activate/dev_manager.c | 2 +- libdm/libdm-deptree.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c index a0f386e77..e4bf4c814 100644 --- a/device_mapper/libdm-deptree.c +++ b/device_mapper/libdm-deptree.c @@ -604,7 +604,7 @@ static struct dm_tree_node *_find_dm_tree_node_by_uuid(struct dm_tree *dtree, default_uuid_prefix = dm_uuid_prefix(); default_uuid_prefix_len = strlen(default_uuid_prefix); - if (suffix_list && (suffix_position = rindex(uuid, '-'))) { + if (suffix_list && (suffix_position = strrchr(uuid, '-'))) { while ((suffix = suffix_list[i++])) { if (strcmp(suffix_position + 1, suffix)) continue; diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index a8516d661..a73a556b2 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -838,7 +838,7 @@ static int _info(struct cmd_context *cmd, return 1; /* Check for original version of dlid before the suffixes got added in 2.02.106 */ - if ((suffix_position = rindex(dlid, '-'))) { + if ((suffix_position = strrchr(dlid, '-'))) { while ((suffix = uuid_suffix_list[i++])) { if (strcmp(suffix_position + 1, suffix)) continue; diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index d7fb5ef13..c14b6ef56 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -566,7 +566,7 @@ static struct dm_tree_node *_find_dm_tree_node_by_uuid(struct dm_tree *dtree, default_uuid_prefix = dm_uuid_prefix(); default_uuid_prefix_len = strlen(default_uuid_prefix); - if (suffix_list && (suffix_position = rindex(uuid, '-'))) { + if (suffix_list && (suffix_position = strrchr(uuid, '-'))) { while ((suffix = suffix_list[i++])) { if (strcmp(suffix_position + 1, suffix)) continue;