Skip to content

nvme-print, ocp-print-json: fix to output alloc_error #3140

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
igaw merged 1 commit into from
Mar 10, 2026
+14 −13
Merged

nvme-print, ocp-print-json: fix to output alloc_error #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions nvme-print-json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ static void obj_add_result(struct json_object *o, const char *v, ...)
va_start(ap, v);

if (vasprintf(&value, v, ap) < 0)
value = alloc_error;
value = NULL;

obj_add_str(o, "Result", value);
obj_add_str(o, "Result", value ? value : alloc_error);

va_end(ap);
}
Expand All @@ -139,9 +139,9 @@ static void obj_add_key(struct json_object *o, const char *k, const char *v, ...
va_start(ap, v);

if (vasprintf(&value, v, ap) < 0)
value = alloc_error;
value = NULL;

obj_add_str(o, k, value);
obj_add_str(o, k, value ? value : alloc_error);

va_end(ap);
}
Expand Down Expand Up @@ -5357,9 +5357,9 @@ static void json_output_message(bool error, const char *msg, va_list ap)
_cleanup_free_ char *value = NULL;

if (vasprintf(&value, msg, ap) < 0)
value = alloc_error;
value = NULL;

obj_add_str(r, error ? "error" : "result", value);
obj_add_str(r, error ? "error" : "result", value ? value : alloc_error);

obj_print(r);
}
Expand All @@ -5371,9 +5371,10 @@ static void json_output_perror(const char *msg, va_list ap)
_cleanup_free_ char *error = NULL;

if (vasprintf(&error, msg, ap) < 0)
error = alloc_error;
error = NULL;

obj_add_key(r, "error", "%s: %s", error, nvme_strerror(errno));
obj_add_key(r, "error", "%s: %s", error ? error : alloc_error,
nvme_strerror(errno));

json_output_object(r);
}
Expand Down
6 changes: 3 additions & 3 deletions nvme-print-stdout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6281,9 +6281,9 @@ static void stdout_perror(const char *msg, va_list ap)
_cleanup_free_ char *error = NULL;

if (vasprintf(&error, msg, ap) < 0)
error = alloc_error;
error = NULL;

perror(error);
perror(error ? error : alloc_error);
}

static void stdout_key_value(const char *key, const char *val, va_list ap)
Expand All @@ -6293,7 +6293,7 @@ static void stdout_key_value(const char *key, const char *val, va_list ap)
if (vasprintf(&value, val, ap) < 0)
value = NULL;

printf("%s: %s\n", key, value ? value : "Could not allocate string");
printf("%s: %s\n", key, value ? value : alloc_error);
}

static void stdout_discovery_log(struct nvmf_discovery_log *log, int numrec)
Expand Down
4 changes: 2 additions & 2 deletions plugins/ocp/ocp-print-json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ static void obj_add_result(struct json_object *o, const char *v, ...)
va_start(ap, v);

if (vasprintf(&value, v, ap) < 0)
value = alloc_error;
value = NULL;

obj_add_str(o, "Result", value);
obj_add_str(o, "Result", value ? value : alloc_error);

va_end(ap);
}
Expand Down