Commit f8e20d05 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Args.c: rename nxagentParseOptions to nxagentParseSingleOption

new name is more descriptive
parent fad80bc4
...@@ -1037,14 +1037,14 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -1037,14 +1037,14 @@ int ddxProcessArgument(int argc, char *argv[], int i)
return 0; return 0;
} }
static void nxagentParseOptions(char *name, char *value) static void nxagentParseSingleOption(char *name, char *value)
{ {
int size, argc; int size, argc;
char *argv[2] = { NULL, NULL }; char *argv[2] = { NULL, NULL };
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentParseOptions: Processing option '%s' = '%s'.\n", fprintf(stderr, "nxagentParseSingleOption: Processing option '%s' = '%s'.\n",
validateString(name), validateString(value)); validateString(name), validateString(value));
#endif #endif
...@@ -1081,7 +1081,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1081,7 +1081,7 @@ static void nxagentParseOptions(char *name, char *value)
if (nxagentReconnectTrap == True) if (nxagentReconnectTrap == True)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentParseOptions: Ignoring option 'render' at reconnection.\n"); fprintf(stderr, "nxagentParseSingleOption: Ignoring option 'render' at reconnection.\n");
#endif #endif
} }
else if (nxagentRenderEnable == UNDEFINED) else if (nxagentRenderEnable == UNDEFINED)
...@@ -1113,7 +1113,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1113,7 +1113,7 @@ static void nxagentParseOptions(char *name, char *value)
if (nxagentReconnectTrap == True) if (nxagentReconnectTrap == True)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentParseOptions: Ignoring option 'fullscreen' at reconnection.\n"); fprintf(stderr, "nxagentParseSingleOption: Ignoring option 'fullscreen' at reconnection.\n");
#endif #endif
} }
else if (!strcmp(value, "1")) else if (!strcmp(value, "1"))
...@@ -1283,7 +1283,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1283,7 +1283,7 @@ static void nxagentParseOptions(char *name, char *value)
if (nxagentReconnectTrap == True) if (nxagentReconnectTrap == True)
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentParseOptions: Ignoring option 'autodpi' at reconnection.\n"); fprintf(stderr, "nxagentParseSingleOption: Ignoring option 'autodpi' at reconnection.\n");
#endif #endif
} }
else if (!strcmp(value, "0")) else if (!strcmp(value, "0"))
...@@ -1368,7 +1368,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1368,7 +1368,7 @@ static void nxagentParseOptions(char *name, char *value)
if ((errno) && (0 == sleep_parse)) if ((errno) && (0 == sleep_parse))
{ {
fprintf(stderr, "nxagentParseOptions: Unable to convert value [%s] of option [%s]. " fprintf(stderr, "nxagentParseSingleOption: Unable to convert value [%s] of option [%s]. "
"Ignoring option.\n", "Ignoring option.\n",
validateString(value), validateString(name)); validateString(value), validateString(name));
...@@ -1379,7 +1379,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1379,7 +1379,7 @@ static void nxagentParseOptions(char *name, char *value)
{ {
sleep_parse = UINT_MAX; sleep_parse = UINT_MAX;
fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " fprintf(stderr, "nxagentParseSingleOption: Warning: value [%s] of option [%s] "
"out of range, clamped to [%lu].\n", "out of range, clamped to [%lu].\n",
validateString(value), validateString(name), sleep_parse); validateString(value), validateString(name), sleep_parse);
} }
...@@ -1388,7 +1388,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1388,7 +1388,7 @@ static void nxagentParseOptions(char *name, char *value)
{ {
sleep_parse = 0; sleep_parse = 0;
fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " fprintf(stderr, "nxagentParseSingleOption: Warning: value [%s] of option [%s] "
"out of range, clamped to [%lu].\n", "out of range, clamped to [%lu].\n",
validateString(value), validateString(name), sleep_parse); validateString(value), validateString(name), sleep_parse);
} }
...@@ -1427,7 +1427,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1427,7 +1427,7 @@ static void nxagentParseOptions(char *name, char *value)
if ((errno) && (0 == tolerance_parse)) if ((errno) && (0 == tolerance_parse))
{ {
fprintf(stderr, "nxagentParseOptions: Unable to convert value [%s] of option [%s]. " fprintf(stderr, "nxagentParseSingleOption: Unable to convert value [%s] of option [%s]. "
"Ignoring option.\n", "Ignoring option.\n",
validateString(value), validateString(name)); validateString(value), validateString(name));
...@@ -1438,7 +1438,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1438,7 +1438,7 @@ static void nxagentParseOptions(char *name, char *value)
{ {
tolerance_parse = UINT_MAX; tolerance_parse = UINT_MAX;
fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " fprintf(stderr, "nxagentParseSingleOption: Warning: value [%s] of option [%s] "
"out of range, clamped to [%lu].\n", "out of range, clamped to [%lu].\n",
validateString(value), validateString(name), tolerance_parse); validateString(value), validateString(name), tolerance_parse);
} }
...@@ -1447,7 +1447,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1447,7 +1447,7 @@ static void nxagentParseOptions(char *name, char *value)
{ {
tolerance_parse = 0; tolerance_parse = 0;
fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " fprintf(stderr, "nxagentParseSingleOption: Warning: value [%s] of option [%s] "
"out of range, clamped to [%lu].\n", "out of range, clamped to [%lu].\n",
validateString(value), validateString(name), tolerance_parse); validateString(value), validateString(name), tolerance_parse);
} }
...@@ -1460,7 +1460,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1460,7 +1460,7 @@ static void nxagentParseOptions(char *name, char *value)
case ToleranceChecksBypass: case ToleranceChecksBypass:
break; break;
default: default:
fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of " fprintf(stderr, "nxagentParseSingleOption: Warning: value [%s] of "
"option [%s] unknown, will be mapped to " "option [%s] unknown, will be mapped to "
"\"Bypass\" [%u] value internally.\n", "\"Bypass\" [%u] value internally.\n",
validateString(value), validateString(name), validateString(value), validateString(name),
...@@ -1495,7 +1495,7 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1495,7 +1495,7 @@ static void nxagentParseOptions(char *name, char *value)
else else
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentParseOptions: Ignored option [%s] with value [%s].\n", fprintf(stderr, "nxagentParseSingleOption: Ignored option [%s] with value [%s].\n",
validateString(name), validateString(value)); validateString(name), validateString(value));
#endif #endif
...@@ -1563,7 +1563,7 @@ static void nxagentParseOptionString(char *string) ...@@ -1563,7 +1563,7 @@ static void nxagentParseOptionString(char *string)
value = NULL; value = NULL;
} }
nxagentParseOptions(option, value); nxagentParseSingleOption(option, value);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment