From 13835b5f6cfbd117294a2c158f78d1d0d364ccd6 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Mon, 2 Jul 2007 11:17:21 +0000 Subject: [PATCH] Don't use index and rindex functions marked by SUSv3 as legacy - Jakub Bogusz --- WHATS_NEW | 1 + lib/activate/activate.c | 2 +- lib/activate/dev_manager.c | 2 +- lib/format_text/archive.c | 2 +- lib/format_text/format-text.c | 4 ++-- lib/snapshot/snapshot.c | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index e66f7b125..1f020cf1f 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.27 - ================================ + Don't use index and rindex functions marked by SUSv3 as legacy. Fix vgsplit if splitting all PVs from VG. Fix lvmdiskscan volume reporting when run in the lvm shell Fix missing lvm_shell symbol in lvm2cmd library. (2.02.23) diff --git a/lib/activate/activate.c b/lib/activate/activate.c index aba7f91c7..980351606 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -313,7 +313,7 @@ static int _passes_activation_filter(struct cmd_context *cmd, else continue; } - if (!index(str, '/')) { + if (!strchr(str, '/')) { /* vgname supplied */ if (!strcmp(str, lv->vg->name)) return 1; diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index d452150bf..3282f9728 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -561,7 +561,7 @@ int dev_manager_mirror_percent(struct dev_manager *dm, log_debug("Getting device info for %s", dl->name); /* Rename? */ - if ((suffix = rindex(dl->dlid + sizeof(UUID_PREFIX) - 1, '-'))) + if ((suffix = strrchr(dl->dlid + sizeof(UUID_PREFIX) - 1, '-'))) suffix++; newname = build_dm_name(dm->mem, dm->vg_name, dl->lv->name, suffix); diff --git a/lib/format_text/archive.c b/lib/format_text/archive.c index ca94c7424..c6af857b1 100644 --- a/lib/format_text/archive.c +++ b/lib/format_text/archive.c @@ -71,7 +71,7 @@ static int _split_vg(const char *filename, char *vgname, size_t vg_size, if (strcmp(".vg", dot)) return 0; - if (!(underscore = rindex(filename, '_'))) + if (!(underscore = strrchr(filename, '_'))) return 0; if (sscanf(underscore + 1, "%u", ix) != 1) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index b43d0c83f..e8bf6f6fe 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -850,7 +850,7 @@ static int _vg_write_file(struct format_instance *fid, struct volume_group *vg, char *slash; char temp_file[PATH_MAX], temp_dir[PATH_MAX]; - slash = rindex(tc->path_edit, '/'); + slash = strrchr(tc->path_edit, '/'); if (slash == 0) strcpy(temp_dir, "."); @@ -948,7 +948,7 @@ static int _vg_commit_file(struct format_instance *fid, struct volume_group *vg, return 0; /* vgrename? */ - if ((slash = rindex(tc->path_live, '/'))) + if ((slash = strrchr(tc->path_live, '/'))) slash = slash + 1; else slash = tc->path_live; diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c index 2dad6dc7e..34417cb0a 100644 --- a/lib/snapshot/snapshot.c +++ b/lib/snapshot/snapshot.c @@ -98,7 +98,7 @@ static int _snap_target_percent(void **target_state __attribute((unused)), float percent2; uint64_t numerator, denominator; - if (index(params, '/')) { + if (strchr(params, '/')) { if (sscanf(params, "%" PRIu64 "/%" PRIu64, &numerator, &denominator) == 2) { *total_numerator += numerator; -- 2.43.5