Skip to content

Fix: can not get cli_get_value a qualifier twice #2410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshStillerman merged 2 commits into from
Nov 3, 2021
Merged

Fix: can not get cli_get_value a qualifier twice #2410

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce2f29
Fix: can not get cli_get_value a qualifier twice
joshStillerman Nov 3, 2021
f44eb89
Fix: compiler warning
joshStillerman Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 36 additions & 34 deletions tcl/tcl_set_node.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,42 @@ EXPORT int TclSetNode(void *ctx, char **error, char **output)
void *ctx1 = 0;
char *nodename = 0;
char *statusStr = 0;
unsigned char compression_method=0;

cli_get_value(ctx, "NODENAME", &nodename);
cli_get_value(ctx, "STATUS", &statusStr);
log = cli_present(ctx, "LOG") & 1;

if (cli_present(ctx, "COMPRESSION_METHOD"))
{
char *compression_method_str = 0;
if(cli_get_value(ctx, "COMPRESSION_METHOD", &compression_method_str) & 1)
{
char *p = compression_method_str;
unsigned int i;
for ( ; *p; ++p) *p = tolower(*p);
for (i=0; i < NUM_COMPRESSION_METHODS; i++)
{
if(strcmp(compression_method_str, compression_methods[i].name) == 0)
{
compression_method=i;
break;
}
}
if(i >= NUM_COMPRESSION_METHODS)
{
*error = malloc(strlen(nodename) + strlen(compression_method_str) + 100);
sprintf(*error,
"Error: Problem setting compression method for node %s\n"
"\t%s not a valid compression method\n",
nodename, compression_method_str);

}
free(compression_method_str);
}
}


usageMask = -1;
while ((status = TreeFindNodeWild(nodename, &nid, &ctx1, usageMask)) & 1)
{
Expand All @@ -84,40 +116,10 @@ EXPORT int TclSetNode(void *ctx, char **error, char **output)
}
if (cli_present(ctx, "COMPRESSION_METHOD"))
{
char *compression_method_str = 0;
if(cli_get_value(ctx, "COMPRESSION_METHOD", &compression_method_str) & 1)
{
unsigned int i;
unsigned char compression_method=0;
char *p = compression_method_str;
for ( ; *p; ++p) *p = tolower(*p);
for (i=0; i < NUM_COMPRESSION_METHODS; i++)
{
if(strcmp(compression_method_str, compression_methods[i].name) == 0)
{
compression_method=i;
break;
}
}
if(i < NUM_COMPRESSION_METHODS)
{
NCI_ITM setnci[] = {{sizeof(compression_method), NciCOMPRESSION_METHOD, 0, 0},
{0, NciEND_OF_LIST, 0, 0}};
setnci[0].pointer = (unsigned char *)&compression_method;
TreeSetNci(nid, setnci);
}
else
{
*error = malloc(strlen(nodename) + strlen(compression_method_str) + 100);
sprintf(*error,
"Error: Problem setting compression method for node %s\n"
"\t%s not a valid compression method\n",
nodename, compression_method_str);
free(compression_method_str);
goto error;
}
free(compression_method_str);
}
NCI_ITM setnci[] = {{sizeof(compression_method), NciCOMPRESSION_METHOD, 0, 0},
{0, NciEND_OF_LIST, 0, 0}};
setnci[0].pointer = (unsigned char *)&compression_method;
TreeSetNci(nid, setnci);
}

switch (cli_present(ctx, "SUBTREE"))
Expand Down