shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-21 22:04:19 +03:00
Code Releases Activity

fix lvmcmdline warning

Browse Source 
declaration of ‘usage’ shadows a globa
This commit is contained in:
David Teigland 2017-01-12 14:36:31 -06:00
parent db1a9299ab
commit 5f86dd22ba
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tools/lvmcmdline.c
View File

@ -1288,7 +1288,7 @@ static int _command_required_pos_matches(struct cmd_context *cmd, int ci, int rp
#define HELP_LINE_SIZE 1024
static void _print_usage(const char *usage, int only_required)
static void _print_usage(const char *usage_str, int only_required)
{
char buf[HELP_LINE_SIZE];
int optional_ui = 0;
@ -1296,7 +1296,7 @@ static void _print_usage(const char *usage, int only_required)
int ui;
int bi;
if (!usage || !strlen(usage))
if (!usage_str || !strlen(usage_str))
return;
/*
@ -1313,32 +1313,32 @@ static void _print_usage(const char *usage, int only_required)
memset(buf, 0, sizeof(buf));
bi = 0;
for (ui = 0; ui < strlen(usage); ui++) {
if (!bi && ((usage[ui] == ' ') || (usage[ui] == '\n')))
for (ui = 0; ui < strlen(usage_str); ui++) {
if (!bi && ((usage_str[ui] == ' ') || (usage_str[ui] == '\n')))
continue;
/* The first "[ " indicates the start of the optional opt_args. */
if ((usage[ui] == '[') && (usage[ui+1] == ' ')) {
if ((usage_str[ui] == '[') && (usage_str[ui+1] == ' ')) {
optional_ui = ui;
break;
}
if (usage[ui] == '\0')
if (usage_str[ui] == '\0')
break;
if (usage[ui] == '(') {
if (usage_str[ui] == '(') {
buf[bi++] = '\n';
buf[bi++] = '\t';
}
buf[bi++] = usage[ui];
buf[bi++] = usage_str[ui];
if (usage[ui] == ')') {
if (usage_str[ui] == ')') {
buf[bi++] = '\n';
buf[bi++] = '\t';
}
if (usage[ui] == ',') {
if (usage_str[ui] == ',') {
buf[bi++] = '\n';
buf[bi++] = '\t';
buf[bi++] = ' ';
@ -1368,25 +1368,25 @@ static void _print_usage(const char *usage, int only_required)
memset(buf, 0, sizeof(buf));
bi = 0;
for (ui = optional_ui; ui < strlen(usage); ui++) {
for (ui = optional_ui; ui < strlen(usage_str); ui++) {
/* The second "[ " indicates the start of the optional pos_args. */
if ((ui > optional_ui) && (usage[ui] == '[') && (usage[ui+1] == ' ')) {
if ((ui > optional_ui) && (usage_str[ui] == '[') && (usage_str[ui+1] == ' ')) {
optional_pos_ui = ui;
break;
}
if (usage[ui] == '\0')
if (usage_str[ui] == '\0')
break;
if (usage[ui] == '\n')
if (usage_str[ui] == '\n')
break;
if (!bi)
buf[bi++] = '\t';
buf[bi++] = usage[ui];
buf[bi++] = usage_str[ui];
if (usage[ui] == ',') {
if (usage_str[ui] == ',') {
buf[bi++] = '\n';
buf[bi++] = '\t';
buf[bi++] = ' ';
@ -1413,16 +1413,16 @@ static void _print_usage(const char *usage, int only_required)
memset(buf, 0, sizeof(buf));
bi = 0;
for (ui = optional_pos_ui; ui < strlen(usage); ui++) {
if (usage[ui] == '\0')
for (ui = optional_pos_ui; ui < strlen(usage_str); ui++) {
if (usage_str[ui] == '\0')
break;
if (usage[ui] == '\n')
if (usage_str[ui] == '\n')
break;
if (!bi)
buf[bi++] = '\t';
buf[bi++] = usage[ui];
buf[bi++] = usage_str[ui];
if (bi == (HELP_LINE_SIZE - 1))
break;