shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-23 21:35:29 +03:00
Code Releases Activity

Don't use index and rindex functions marked by SUSv3 as legacy - Jakub Bogusz <qboosh@pld-linux.org>

Browse Source
This commit is contained in:
Dave Wysochanski 2007-07-02 11:17:21 +00:00
parent b228dfaf2c
commit 5f951faf32
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.27 - 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 vgsplit if splitting all PVs from VG.
Fix lvmdiskscan volume reporting when run in the lvm shell Fix lvmdiskscan volume reporting when run in the lvm shell
Fix missing lvm_shell symbol in lvm2cmd library. (2.02.23) Fix missing lvm_shell symbol in lvm2cmd library. (2.02.23)

2
lib/activate/activate.c
View File

@ -313,7 +313,7 @@ static int _passes_activation_filter(struct cmd_context *cmd,
else else
continue; continue;
} }
if (!index(str, '/')) { if (!strchr(str, '/')) {
/* vgname supplied */ /* vgname supplied */
if (!strcmp(str, lv->vg->name)) if (!strcmp(str, lv->vg->name))
return 1; return 1;

2
lib/activate/dev_manager.c
View File

@ -561,7 +561,7 @@ int dev_manager_mirror_percent(struct dev_manager *dm,
log_debug("Getting device info for %s", dl->name); log_debug("Getting device info for %s", dl->name);
/* Rename? */ /* Rename? */
if ((suffix = rindex(dl->dlid + sizeof(UUID_PREFIX) - 1, '-'))) if ((suffix = strrchr(dl->dlid + sizeof(UUID_PREFIX) - 1, '-')))
suffix++; suffix++;
newname = build_dm_name(dm->mem, dm->vg_name, dl->lv->name, newname = build_dm_name(dm->mem, dm->vg_name, dl->lv->name,
suffix); suffix);

2
lib/format_text/archive.c
View File

@ -71,7 +71,7 @@ static int _split_vg(const char *filename, char *vgname, size_t vg_size,
if (strcmp(".vg", dot)) if (strcmp(".vg", dot))
return 0; return 0;
if (!(underscore = rindex(filename, '_'))) if (!(underscore = strrchr(filename, '_')))
return 0; return 0;
if (sscanf(underscore + 1, "%u", ix) != 1) if (sscanf(underscore + 1, "%u", ix) != 1)

4
lib/format_text/format-text.c
View File

@ -850,7 +850,7 @@ static int _vg_write_file(struct format_instance *fid, struct volume_group *vg,
char *slash; char *slash;
char temp_file[PATH_MAX], temp_dir[PATH_MAX]; char temp_file[PATH_MAX], temp_dir[PATH_MAX];
slash = rindex(tc->path_edit, '/'); slash = strrchr(tc->path_edit, '/');
if (slash == 0) if (slash == 0)
strcpy(temp_dir, "."); strcpy(temp_dir, ".");
@ -948,7 +948,7 @@ static int _vg_commit_file(struct format_instance *fid, struct volume_group *vg,
return 0; return 0;
/* vgrename? */ /* vgrename? */
if ((slash = rindex(tc->path_live, '/'))) if ((slash = strrchr(tc->path_live, '/')))
slash = slash + 1; slash = slash + 1;
else else
slash = tc->path_live; slash = tc->path_live;

2
lib/snapshot/snapshot.c
View File

@ -98,7 +98,7 @@ static int _snap_target_percent(void **target_state __attribute((unused)),
float percent2; float percent2;
uint64_t numerator, denominator; uint64_t numerator, denominator;
if (index(params, '/')) { if (strchr(params, '/')) {
if (sscanf(params, "%" PRIu64 "/%" PRIu64, if (sscanf(params, "%" PRIu64 "/%" PRIu64,
&numerator, &denominator) == 2) { &numerator, &denominator) == 2) {
*total_numerator += numerator; *total_numerator += numerator;