[igt-dev] [PATCH i-g-t v3 2/7] runner: make the usage function variadic
Ryszard Knop
ryszard.knop at intel.com
Wed Aug 31 11:07:24 UTC 2022
For easier error logging, make the usage() function variadic and pass
its arguments to vfprintf. Additionally, reorder its arguments so that
it visually matches all the printf functions.
v2:
- usage(msg, ...) -> usage(stderr) (Maira)
- __attribute__ ((format (...))) (Petri)
Signed-off-by: Ryszard Knop <ryszard.knop at intel.com>
---
runner/settings.c | 64 +++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 33 deletions(-)
diff --git a/runner/settings.c b/runner/settings.c
index 06947c91..ba288043 100644
--- a/runner/settings.c
+++ b/runner/settings.c
@@ -295,10 +295,17 @@ static const char *usage_str =
" this option if given.\n"
;
-static void usage(const char *extra_message, FILE *f)
+__attribute__ ((format (printf, 2, 3)))
+static void usage(FILE *f, const char *extra_message, ...)
{
- if (extra_message)
- fprintf(f, "%s\n\n", extra_message);
+ if (extra_message) {
+ va_list args;
+
+ va_start(args, extra_message);
+ vfprintf(f, extra_message, args);
+ fputs("\n\n", f);
+ va_end(args);
+ }
fputs(usage_str, f);
}
@@ -310,12 +317,7 @@ static bool add_regex(struct regex_list *list, char *new)
regex = g_regex_new(new, G_REGEX_OPTIMIZE, 0, &error);
if (error) {
- char *buf = malloc(snprintf(NULL, 0, "Invalid regex '%s': %s", new, error->message) + 1);
-
- sprintf(buf, "Invalid regex '%s': %s", new, error->message);
- usage(buf, stderr);
-
- free(buf);
+ usage(stderr, "Invalid regex '%s': %s", new, error->message);
g_error_free(error);
return false;
}
@@ -549,7 +551,7 @@ bool parse_options(int argc, char **argv,
print_version();
goto error;
case OPT_HELP:
- usage(NULL, stdout);
+ usage(stdout, NULL);
goto error;
case OPT_NAME:
settings->name = strdup(optarg);
@@ -574,7 +576,7 @@ bool parse_options(int argc, char **argv,
break;
case OPT_DISK_USAGE_LIMIT:
if (!parse_usage_limit(settings, optarg)) {
- usage("Cannot parse disk usage limit", stderr);
+ usage(stderr, "Cannot parse disk usage limit");
goto error;
}
break;
@@ -583,7 +585,7 @@ bool parse_options(int argc, char **argv,
break;
case OPT_LOG_LEVEL:
if (!set_log_level(settings, optarg)) {
- usage("Cannot parse log level", stderr);
+ usage(stderr, "Cannot parse log level");
goto error;
}
break;
@@ -631,7 +633,7 @@ bool parse_options(int argc, char **argv,
break;
case OPT_PRUNE_MODE:
if (!set_prune_mode(settings, optarg)) {
- usage("Cannot parse prune mode", stderr);
+ usage(stderr, "Cannot parse prune mode");
goto error;
}
break;
@@ -644,10 +646,10 @@ bool parse_options(int argc, char **argv,
settings->list_all = true;
break;
case '?':
- usage(NULL, stderr);
+ usage(stderr, NULL);
goto error;
default:
- usage("Cannot parse options", stderr);
+ usage(stderr, "Cannot parse options");
goto error;
}
}
@@ -664,7 +666,7 @@ bool parse_options(int argc, char **argv,
case 0:
break;
default:
- usage("Too many arguments for --list-all", stderr);
+ usage(stderr, "Too many arguments for --list-all");
goto error;
}
} else {
@@ -677,10 +679,10 @@ bool parse_options(int argc, char **argv,
settings->results_path = absolute_path(argv[optind]);
break;
case 0:
- usage("Results-path missing", stderr);
+ usage(stderr, "Results-path missing");
goto error;
default:
- usage("Extra arguments after results-path", stderr);
+ usage(stderr, "Extra arguments after results-path");
goto error;
}
if (!settings->name) {
@@ -697,7 +699,7 @@ bool parse_options(int argc, char **argv,
}
if (!settings->test_root) {
- usage("Test root not set", stderr);
+ usage(stderr, "Test root not set");
goto error;
}
@@ -714,17 +716,17 @@ bool validate_settings(struct settings *settings)
int dirfd, fd;
if (settings->test_list && !readable_file(settings->test_list)) {
- usage("Cannot open test-list file", stderr);
+ usage(stderr, "Cannot open test-list file");
return false;
}
if (!settings->results_path) {
- usage("No results-path set; this shouldn't happen", stderr);
+ usage(stderr, "No results-path set; this shouldn't happen");
return false;
}
if (!settings->test_root) {
- usage("No test root set; this shouldn't happen", stderr);
+ usage(stderr, "No test root set; this shouldn't happen");
return false;
}
@@ -780,23 +782,24 @@ bool serialize_settings(struct settings *settings)
FILE *f;
if (!settings->results_path) {
- usage("No results-path set; this shouldn't happen", stderr);
+ usage(stderr, "No results-path set; this shouldn't happen");
return false;
}
if ((dirfd = open(settings->results_path, O_DIRECTORY | O_RDONLY)) < 0) {
mkdir(settings->results_path, 0755);
if ((dirfd = open(settings->results_path, O_DIRECTORY | O_RDONLY)) < 0) {
- usage("Creating results-path failed", stderr);
+ usage(stderr, "Creating results-path failed");
return false;
}
}
+
if (settings->enable_code_coverage) {
strcpy(path, settings->results_path);
strcat(path, CODE_COV_RESULTS_PATH);
if ((covfd = open(path, O_DIRECTORY | O_RDONLY)) < 0) {
if (mkdir(path, 0755)) {
- usage("Creating code coverage path failed", stderr);
+ usage(stderr, "Creating code coverage path failed");
return false;
}
} else {
@@ -806,24 +809,19 @@ bool serialize_settings(struct settings *settings)
if (!settings->overwrite &&
faccessat(dirfd, settings_filename, F_OK, 0) == 0) {
- usage("Settings metadata already exists and not overwriting", stderr);
+ usage(stderr, "Settings metadata already exists and not overwriting");
return false;
}
if (settings->overwrite &&
unlinkat(dirfd, settings_filename, 0) != 0 &&
errno != ENOENT) {
- usage("Error removing old settings metadata", stderr);
+ usage(stderr, "Error removing old settings metadata");
return false;
}
if ((fd = openat(dirfd, settings_filename, O_CREAT | O_EXCL | O_WRONLY, 0666)) < 0) {
- char *msg;
-
- asprintf(&msg, "Creating settings serialization file failed: %s", strerror(errno));
- usage(msg, stderr);
-
- free(msg);
+ usage(stderr, "Creating settings serialization file failed: %s", strerror(errno));
close(dirfd);
return false;
}
--
2.37.2
More information about the igt-dev
mailing list