RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-16 09:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: factor out common message helper for internal errors

Browse Source 
In a few occasions there's an internal report, make a common helper so
the prefix message is not necessary and the stack trace can be printed
if enabled.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-09-28 00:52:00 +02:00
parent b5cf79f107
commit d35b7f87c4
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/format-output.c
View File

@ -56,15 +56,14 @@ static void fmt_indent2(int indent)
static void fmt_error(struct format_ctx *fctx) static void fmt_error(struct format_ctx *fctx)
{ {
printf("INTERNAL ERROR: formatting json: depth=%d\n", fctx->depth); internal_error("formatting json: depth=%d", fctx->depth);
exit(1); exit(1);
} }
static void fmt_inc_depth(struct format_ctx *fctx) static void fmt_inc_depth(struct format_ctx *fctx)
{ {
if (fctx->depth >= JSON_NESTING_LIMIT - 1) { if (fctx->depth >= JSON_NESTING_LIMIT - 1) {
printf("INTERNAL ERROR: nesting too deep, limit %d\n", internal_error("nesting too deep, limit %d", JSON_NESTING_LIMIT);
JSON_NESTING_LIMIT);
exit(1); exit(1);
} }
fctx->depth++; fctx->depth++;
@ -73,7 +72,7 @@ static void fmt_inc_depth(struct format_ctx *fctx)
static void fmt_dec_depth(struct format_ctx *fctx) static void fmt_dec_depth(struct format_ctx *fctx)
{ {
if (fctx->depth < 1) { if (fctx->depth < 1) {
printf("INTERNAL ERROR: nesting below first level\n"); internal_error("nesting below first level");
exit(1); exit(1);
} }
fctx->depth--; fctx->depth--;
@ -244,7 +243,7 @@ void fmt_print(struct format_ctx *fctx, const char* key, ...)
row++; row++;
} }
if (!found) { if (!found) {
printf("INTERNAL ERROR: unknown key: %s\n", key); internal_error("unknown key: %s", key);
exit(1); exit(1);
} }
@ -319,7 +318,7 @@ void fmt_print(struct format_ctx *fctx, const char* key, ...)
printf("%s", pretty_size_mode(size, unit_mode)); printf("%s", pretty_size_mode(size, unit_mode));
} else { } else {
printf("INTERNAL ERROR: unknown format %s\n", row->fmt); internal_error("unknown format %s", row->fmt);
} }
fmt_end_value(fctx, row); fmt_end_value(fctx, row);

16
common/messages.c
View File

@ -77,6 +77,22 @@ int __btrfs_error_on(int condition, const char *fmt, ...)
return 1; return 1;
} }
__attribute__ ((format (printf, 1, 2)))
void internal_error(const char *fmt, ...)
{
va_list vargs;
va_start(vargs, fmt);
fputs("INTERNAL ERROR: ", stderr);
vfprintf(stderr, fmt, vargs);
va_end(vargs);
fputc('\n', stderr);
#ifndef BTRFS_DISABLE_BACKTRACE
print_trace();
#endif
}
/* /*
* Print a message according to the global verbosity level. * Print a message according to the global verbosity level.
* *

3
common/messages.h
View File

@ -100,6 +100,9 @@ int __btrfs_warning_on(int condition, const char *fmt, ...);
__attribute__ ((format (printf, 2, 3))) __attribute__ ((format (printf, 2, 3)))
int __btrfs_error_on(int condition, const char *fmt, ...); int __btrfs_error_on(int condition, const char *fmt, ...);
__attribute__ ((format (printf, 1, 2)))
void internal_error(const char *fmt, ...);
/* /*
* Level of messages that must be printed by default (in case the verbosity * Level of messages that must be printed by default (in case the verbosity
* options haven't been set by the user) due to backward compatibility reasons * options haven't been set by the user) due to backward compatibility reasons

7
common/units.c
View File

@ -17,6 +17,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "common/units.h" #include "common/units.h"
#include "common/messages.h"
/* /*
* Note: this function uses a static per-thread buffer. Do not call this * Note: this function uses a static per-thread buffer. Do not call this
@ -77,8 +78,7 @@ int pretty_size_snprintf(u64 size, char *str, size_t str_size, unsigned unit_mod
/* Unknown mode */ /* Unknown mode */
if (!base) { if (!base) {
fprintf(stderr, "INTERNAL ERROR: unknown unit base, mode %u\n", internal_error("unknown unit base, mode %u", unit_mode);
unit_mode);
assert(0); assert(0);
return -1; return -1;
} }
@ -134,8 +134,7 @@ int pretty_size_snprintf(u64 size, char *str, size_t str_size, unsigned unit_mod
if (num_divs >= ARRAY_SIZE(unit_suffix_binary)) { if (num_divs >= ARRAY_SIZE(unit_suffix_binary)) {
str[0] = '\0'; str[0] = '\0';
printf("INTERNAL ERROR: unsupported unit suffix, index %d\n", internal_error("unsupported unit suffix, index %d", num_divs);
num_divs);
assert(0); assert(0);
return -1; return -1;
} }