Args.c: do not use [] for warnings

uli42 · uli42 · commit 561c93e3a491 · 2017-11-19T02:26:52.000+01:00
Within Args.c values in messages are not enclosed by [] but ''.
The [] format is only used for debugging/testing messages.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1404,7 +1404,7 @@ static void nxagentParseOptions(char *name, char *value)
 
     if ((errno) && (0 == sleep_parse))
     {
-      fprintf(stderr, "Warning: Unable to convert value [%s] of option [%s]. "
+      fprintf(stderr, "Warning: Unable to convert value '%s' of option '%s'. "
                       "Ignoring option.\n",
                       validateString(value), name);
 
@@ -1415,17 +1415,17 @@ static void nxagentParseOptions(char *name, char *value)
     {
       sleep_parse = UINT_MAX;
 
-      fprintf(stderr, "Warning: value [%s] of option [%s] "
-                      "out of range, clamped to [%lu].\n",
+      fprintf(stderr, "Warning: value '%s' of option '%s' "
+                      "out of range, clamped to '%lu'.\n",
                       validateString(value), name, sleep_parse);
     }
 
     if (0 > sleep_parse)
     {
       sleep_parse = 0;
 
-      fprintf(stderr, "Warning: value [%s] of option [%s] "
-                      "out of range, clamped to [%lu].\n",
+      fprintf(stderr, "Warning: value '%s' of option '%s' "
+                      "out of range, clamped to '%lu'.\n",
                       validateString(value), name, sleep_parse);
     }
 
@@ -1463,7 +1463,7 @@ static void nxagentParseOptions(char *name, char *value)
 
       if ((errno) && (0 == tolerance_parse))
       {
-        fprintf(stderr, "Warning: Unable to convert value [%s] of option [%s]. "
+        fprintf(stderr, "Warning: Unable to convert value '%s' of option '%s'. "
                         "Ignoring option.\n",
                         validateString(value), name);
 
@@ -1474,17 +1474,17 @@ static void nxagentParseOptions(char *name, char *value)
       {
         tolerance_parse = UINT_MAX;
 
-        fprintf(stderr, "Warning: value [%s] of option [%s] "
-                        "out of range, clamped to [%lu].\n",
+        fprintf(stderr, "Warning: value '%s' of option '%s' "
+                        "out of range, clamped to '%lu'.\n",
                         validateString(value), name, tolerance_parse);
       }
 
       if (0 > tolerance_parse)
       {
         tolerance_parse = 0;
 
-        fprintf(stderr, "Warning: value [%s] of option [%s] "
-                        "out of range, clamped to [%lu].\n",
+        fprintf(stderr, "Warning: value '%s' of option '%s' "
+                        "out of range, clamped to '%lu'.\n",
                         validateString(value), name, tolerance_parse);
       }
 

Original file line number	Diff line number	Diff line change
`@@ -1404,7 +1404,7 @@ static void nxagentParseOptions(char name, char value)`
`1404`	`1404`
`1405`	`1405`	`if ((errno) && (0 == sleep_parse))`
`1406`	`1406`	`{`
`1407`		`- fprintf(stderr, "Warning: Unable to convert value [%s] of option [%s]. "`
	`1407`	`+ fprintf(stderr, "Warning: Unable to convert value '%s' of option '%s'. "`
`1408`	`1408`	`"Ignoring option.\n",`
`1409`	`1409`	`validateString(value), name);`
`1410`	`1410`
`@@ -1415,17 +1415,17 @@ static void nxagentParseOptions(char name, char value)`
`1415`	`1415`	`{`
`1416`	`1416`	`sleep_parse = UINT_MAX;`
`1417`	`1417`
`1418`		`- fprintf(stderr, "Warning: value [%s] of option [%s] "`
`1419`		`- "out of range, clamped to [%lu].\n",`
	`1418`	`+ fprintf(stderr, "Warning: value '%s' of option '%s' "`
	`1419`	`+ "out of range, clamped to '%lu'.\n",`
`1420`	`1420`	`validateString(value), name, sleep_parse);`
`1421`	`1421`	`}`
`1422`	`1422`
`1423`	`1423`	`if (0 > sleep_parse)`
`1424`	`1424`	`{`
`1425`	`1425`	`sleep_parse = 0;`
`1426`	`1426`
`1427`		`- fprintf(stderr, "Warning: value [%s] of option [%s] "`
`1428`		`- "out of range, clamped to [%lu].\n",`
	`1427`	`+ fprintf(stderr, "Warning: value '%s' of option '%s' "`
	`1428`	`+ "out of range, clamped to '%lu'.\n",`
`1429`	`1429`	`validateString(value), name, sleep_parse);`
`1430`	`1430`	`}`
`1431`	`1431`
`@@ -1463,7 +1463,7 @@ static void nxagentParseOptions(char name, char value)`
`1463`	`1463`
`1464`	`1464`	`if ((errno) && (0 == tolerance_parse))`
`1465`	`1465`	`{`
`1466`		`- fprintf(stderr, "Warning: Unable to convert value [%s] of option [%s]. "`
	`1466`	`+ fprintf(stderr, "Warning: Unable to convert value '%s' of option '%s'. "`
`1467`	`1467`	`"Ignoring option.\n",`
`1468`	`1468`	`validateString(value), name);`
`1469`	`1469`
`@@ -1474,17 +1474,17 @@ static void nxagentParseOptions(char name, char value)`
`1474`	`1474`	`{`
`1475`	`1475`	`tolerance_parse = UINT_MAX;`
`1476`	`1476`
`1477`		`- fprintf(stderr, "Warning: value [%s] of option [%s] "`
`1478`		`- "out of range, clamped to [%lu].\n",`
	`1477`	`+ fprintf(stderr, "Warning: value '%s' of option '%s' "`
	`1478`	`+ "out of range, clamped to '%lu'.\n",`
`1479`	`1479`	`validateString(value), name, tolerance_parse);`
`1480`	`1480`	`}`
`1481`	`1481`
`1482`	`1482`	`if (0 > tolerance_parse)`
`1483`	`1483`	`{`
`1484`	`1484`	`tolerance_parse = 0;`
`1485`	`1485`
`1486`		`- fprintf(stderr, "Warning: value [%s] of option [%s] "`
`1487`		`- "out of range, clamped to [%lu].\n",`
	`1486`	`+ fprintf(stderr, "Warning: value '%s' of option '%s' "`
	`1487`	`+ "out of range, clamped to '%lu'.\n",`
`1488`	`1488`	`validateString(value), name, tolerance_parse);`
`1489`	`1489`	`}`
`1490`	`1490`