Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 09:44:04 +00:00
Code Issues Releases Activity

logging: define CRIT_ERR_FREE and simplify CRIT_ERR

Browse Source 
it's surprising to pass 2 nullptr arguments at most of the callsites of a logging function, so instead let callers explicitly state whether they have auxiliary data to free
This commit is contained in:
bi4k8 2023-05-05 01:24:55 +00:00 committed by bi4k8
parent 19e779cdf9
commit faba25d197
28 changed files with 172 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.cc
View File

@ -365,7 +365,7 @@ double loadgraphval(struct text_object *obj) {
uint8_t cpu_percentage(struct text_object *obj) { uint8_t cpu_percentage(struct text_object *obj) {
if (static_cast<unsigned int>(obj->data.i) > info.cpu_count) { if (static_cast<unsigned int>(obj->data.i) > info.cpu_count) {
NORM_ERR("obj->data.i %i info.cpu_count %i", obj->data.i, info.cpu_count); NORM_ERR("obj->data.i %i info.cpu_count %i", obj->data.i, info.cpu_count);
CRIT_ERR(nullptr, nullptr, "attempting to use more CPUs than you have!"); CRIT_ERR("attempting to use more CPUs than you have!");
} }
if (info.cpu_usage != nullptr) { if (info.cpu_usage != nullptr) {
return round_to_positive_int(info.cpu_usage[obj->data.i] * 100.0); return round_to_positive_int(info.cpu_usage[obj->data.i] * 100.0);
@ -376,7 +376,7 @@ uint8_t cpu_percentage(struct text_object *obj) {
double cpu_barval(struct text_object *obj) { double cpu_barval(struct text_object *obj) {
if (static_cast<unsigned int>(obj->data.i) > info.cpu_count) { if (static_cast<unsigned int>(obj->data.i) > info.cpu_count) {
NORM_ERR("obj->data.i %i info.cpu_count %i", obj->data.i, info.cpu_count); NORM_ERR("obj->data.i %i info.cpu_count %i", obj->data.i, info.cpu_count);
CRIT_ERR(nullptr, nullptr, "attempting to use more CPUs than you have!"); CRIT_ERR("attempting to use more CPUs than you have!");
} }
if (info.cpu_usage != nullptr) { return info.cpu_usage[obj->data.i]; } if (info.cpu_usage != nullptr) { return info.cpu_usage[obj->data.i]; }
return 0.; return 0.;

22
src/conky.cc
View File

@ -1724,7 +1724,7 @@ void main_loop() {
#ifdef SIGNAL_BLOCKING #ifdef SIGNAL_BLOCKING
/* block signals. we will inspect for pending signals later */ /* block signals. we will inspect for pending signals later */
if (sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0) { if (sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0) {
CRIT_ERR(nullptr, NULL, "unable to sigprocmask()"); CRIT_ERR("unable to sigprocmask()");
} }
#endif #endif
@ -1751,7 +1751,7 @@ void main_loop() {
#ifdef SIGNAL_BLOCKING #ifdef SIGNAL_BLOCKING
/* unblock signals of interest and let handler fly */ /* unblock signals of interest and let handler fly */
if (sigprocmask(SIG_SETMASK, &oldmask, nullptr) < 0) { if (sigprocmask(SIG_SETMASK, &oldmask, nullptr) < 0) {
CRIT_ERR(nullptr, NULL, "unable to sigprocmask()"); CRIT_ERR("unable to sigprocmask()");
} }
#endif #endif
@ -2105,7 +2105,7 @@ void initialisation(int argc, char **argv) {
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, if ((kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY,
"kvm_open")) == nullptr) { "kvm_open")) == nullptr) {
CRIT_ERR(nullptr, NULL, "cannot read kvm"); CRIT_ERR("cannot read kvm");
} }
#endif #endif
@ -2133,8 +2133,7 @@ void initialisation(int argc, char **argv) {
case 'm': case 'm':
state->pushinteger(strtol(optarg, &conv_end, 10)); state->pushinteger(strtol(optarg, &conv_end, 10));
if (*conv_end != 0) { if (*conv_end != 0) {
CRIT_ERR(nullptr, nullptr, "'%s' is a wrong xinerama-head index", CRIT_ERR("'%s' is a wrong xinerama-head index", optarg);
optarg);
} }
head_index.lua_set(*state); head_index.lua_set(*state);
break; break;
@ -2170,7 +2169,7 @@ void initialisation(int argc, char **argv) {
case 'u': case 'u':
state->pushinteger(dpi_scale(strtol(optarg, &conv_end, 10))); state->pushinteger(dpi_scale(strtol(optarg, &conv_end, 10)));
if (*conv_end != 0) { if (*conv_end != 0) {
CRIT_ERR(nullptr, nullptr, "'%s' is a wrong update-interval", optarg); CRIT_ERR("'%s' is a wrong update-interval", optarg);
} }
update_interval.lua_set(*state); update_interval.lua_set(*state);
break; break;
@ -2178,8 +2177,7 @@ void initialisation(int argc, char **argv) {
case 'i': case 'i':
state->pushinteger(strtol(optarg, &conv_end, 10)); state->pushinteger(strtol(optarg, &conv_end, 10));
if (*conv_end != 0) { if (*conv_end != 0) {
CRIT_ERR(nullptr, nullptr, "'%s' is a wrong number of update-times", CRIT_ERR("'%s' is a wrong number of update-times", optarg);
optarg);
} }
total_run_times.lua_set(*state); total_run_times.lua_set(*state);
break; break;
@ -2187,8 +2185,7 @@ void initialisation(int argc, char **argv) {
case 'x': case 'x':
state->pushinteger(strtol(optarg, &conv_end, 10)); state->pushinteger(strtol(optarg, &conv_end, 10));
if (*conv_end != 0) { if (*conv_end != 0) {
CRIT_ERR(nullptr, nullptr, "'%s' is a wrong value for the X-position", CRIT_ERR("'%s' is a wrong value for the X-position", optarg);
optarg);
} }
gap_x.lua_set(*state); gap_x.lua_set(*state);
break; break;
@ -2196,8 +2193,7 @@ void initialisation(int argc, char **argv) {
case 'y': case 'y':
state->pushinteger(strtol(optarg, &conv_end, 10)); state->pushinteger(strtol(optarg, &conv_end, 10));
if (*conv_end != 0) { if (*conv_end != 0) {
CRIT_ERR(nullptr, nullptr, "'%s' is a wrong value for the Y-position", CRIT_ERR("'%s' is a wrong value for the Y-position", optarg);
optarg);
} }
gap_y.lua_set(*state); gap_y.lua_set(*state);
break; break;
@ -2259,7 +2255,7 @@ void initialisation(int argc, char **argv) {
memset(tmpstring2, 0, text_buffer_size.get(*state)); memset(tmpstring2, 0, text_buffer_size.get(*state));
if (!conky::initialize_display_outputs()) { if (!conky::initialize_display_outputs()) {
CRIT_ERR(nullptr, nullptr, "initialize_display_outputs() failed."); CRIT_ERR("initialize_display_outputs() failed.");
} }
#ifdef BUILD_GUI #ifdef BUILD_GUI
/* setup lua window globals */ /* setup lua window globals */

67
src/core.cc
View File

@ -382,10 +382,10 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
if (!strcmp(s, #a)) { \ if (!strcmp(s, #a)) { \
obj->cb_handle = create_cb_handle(n); obj->cb_handle = create_cb_handle(n);
#define __OBJ_IF obj_be_ifblock_if(ifblock_opaque, obj) #define __OBJ_IF obj_be_ifblock_if(ifblock_opaque, obj)
#define __OBJ_ARG(...) \ #define __OBJ_ARG(...) \
if (!arg) { \ if (!arg) { \
free(s); \ free(s); \
CRIT_ERR(obj, free_at_crash, __VA_ARGS__); \ CRIT_ERR_FREE(obj, free_at_crash, __VA_ARGS__); \
} }
/* defines to be used below */ /* defines to be used below */
@ -1510,8 +1510,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
END OBJ_IF(if_updatenr, nullptr) obj->data.i = END OBJ_IF(if_updatenr, nullptr) obj->data.i =
arg != nullptr ? strtol(arg, nullptr, 10) : 0; arg != nullptr ? strtol(arg, nullptr, 10) : 0;
if (obj->data.i == 0) { if (obj->data.i == 0) {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"if_updatenr needs a number above 0 as argument"); "if_updatenr needs a number above 0 as argument");
} }
set_updatereset(obj->data.i > get_updatereset() ? obj->data.i set_updatereset(obj->data.i > get_updatereset() ? obj->data.i
: get_updatereset()); : get_updatereset());
@ -1754,7 +1754,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
if (obj->data.i > 0) { if (obj->data.i > 0) {
++obj->data.i; ++obj->data.i;
} else { } else {
CRIT_ERR(obj, free_at_crash, "audacious_title: invalid length argument"); CRIT_ERR_FREE(obj, free_at_crash,
"audacious_title: invalid length argument");
} }
obj->callbacks.print = &print_audacious_title; obj->callbacks.print = &print_audacious_title;
END OBJ(audacious_length, 0) obj->callbacks.print = &print_audacious_length; END OBJ(audacious_length, 0) obj->callbacks.print = &print_audacious_length;
@ -1811,9 +1812,9 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
if (arg != nullptr) { if (arg != nullptr) {
obj->data.s = STRNDUP_ARG; obj->data.s = STRNDUP_ARG;
} else { } else {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"lua_bar needs arguments: <height>,<width> <function name> " "lua_bar needs arguments: <height>,<width> <function name> "
"[function parameters]"); "[function parameters]");
} }
obj->callbacks.barval = &lua_barval; obj->callbacks.barval = &lua_barval;
obj->callbacks.free = &gen_free_opaque; obj->callbacks.free = &gen_free_opaque;
@ -1827,9 +1828,9 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
if (buf != nullptr) { if (buf != nullptr) {
obj->data.s = buf; obj->data.s = buf;
} else { } else {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"lua_graph needs arguments: <function name> [height],[width] " "lua_graph needs arguments: <function name> [height],[width] "
"[gradient colour 1] [gradient colour 2] [scale] [-t] [-l]"); "[gradient colour 1] [gradient colour 2] [scale] [-t] [-l]");
} }
obj->callbacks.graphval = &lua_barval; obj->callbacks.graphval = &lua_barval;
obj->callbacks.free = &gen_free_opaque; obj->callbacks.free = &gen_free_opaque;
@ -1839,9 +1840,9 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
if (arg != nullptr) { if (arg != nullptr) {
obj->data.s = STRNDUP_ARG; obj->data.s = STRNDUP_ARG;
} else { } else {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"lua_gauge needs arguments: <height>,<width> <function name> " "lua_gauge needs arguments: <height>,<width> <function name> "
"[function parameters]"); "[function parameters]");
} }
obj->callbacks.gaugeval = &lua_barval; obj->callbacks.gaugeval = &lua_barval;
obj->callbacks.free = &gen_free_opaque; obj->callbacks.free = &gen_free_opaque;
@ -1897,40 +1898,40 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
END OBJ_ARG( END OBJ_ARG(
nvidia, 0, nvidia, 0,
"nvidia needs an argument") if (set_nvidia_query(obj, arg, NONSPECIAL)) { "nvidia needs an argument") if (set_nvidia_query(obj, arg, NONSPECIAL)) {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"nvidia: invalid argument" "nvidia: invalid argument"
" specified: '%s'", " specified: '%s'",
arg); arg);
} }
obj->callbacks.print = &print_nvidia_value; obj->callbacks.print = &print_nvidia_value;
obj->callbacks.free = &free_nvidia; obj->callbacks.free = &free_nvidia;
END OBJ_ARG( END OBJ_ARG(
nvidiabar, 0, nvidiabar, 0,
"nvidiabar needs an argument") if (set_nvidia_query(obj, arg, BAR)) { "nvidiabar needs an argument") if (set_nvidia_query(obj, arg, BAR)) {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"nvidiabar: invalid argument" "nvidiabar: invalid argument"
" specified: '%s'", " specified: '%s'",
arg); arg);
} }
obj->callbacks.barval = &get_nvidia_barval; obj->callbacks.barval = &get_nvidia_barval;
obj->callbacks.free = &free_nvidia; obj->callbacks.free = &free_nvidia;
END OBJ_ARG( END OBJ_ARG(
nvidiagraph, 0, nvidiagraph, 0,
"nvidiagraph needs an argument") if (set_nvidia_query(obj, arg, GRAPH)) { "nvidiagraph needs an argument") if (set_nvidia_query(obj, arg, GRAPH)) {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"nvidiagraph: invalid argument" "nvidiagraph: invalid argument"
" specified: '%s'", " specified: '%s'",
arg); arg);
} }
obj->callbacks.graphval = &get_nvidia_barval; obj->callbacks.graphval = &get_nvidia_barval;
obj->callbacks.free = &free_nvidia; obj->callbacks.free = &free_nvidia;
END OBJ_ARG( END OBJ_ARG(
nvidiagauge, 0, nvidiagauge, 0,
"nvidiagauge needs an argument") if (set_nvidia_query(obj, arg, GAUGE)) { "nvidiagauge needs an argument") if (set_nvidia_query(obj, arg, GAUGE)) {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"nvidiagauge: invalid argument" "nvidiagauge: invalid argument"
" specified: '%s'", " specified: '%s'",
arg); arg);
} }
obj->callbacks.gaugeval = &get_nvidia_barval; obj->callbacks.gaugeval = &get_nvidia_barval;
obj->callbacks.free = &free_nvidia; obj->callbacks.free = &free_nvidia;
@ -1940,7 +1941,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
apcupsd, &update_apcupsd, apcupsd, &update_apcupsd,
"apcupsd needs arguments: <host> <port>") if (apcupsd_scan_arg(arg) != "apcupsd needs arguments: <host> <port>") if (apcupsd_scan_arg(arg) !=
0) { 0) {
CRIT_ERR(obj, free_at_crash, "apcupsd needs arguments: <host> <port>"); CRIT_ERR_FREE(obj, free_at_crash, "apcupsd needs arguments: <host> <port>");
} }
obj->callbacks.print = &gen_print_nothing; obj->callbacks.print = &gen_print_nothing;
END OBJ(apcupsd_name, &update_apcupsd) obj->callbacks.print = END OBJ(apcupsd_name, &update_apcupsd) obj->callbacks.print =

2
src/darwin.mm
View File

@ -930,7 +930,7 @@ void get_cpu_count() {
*/ */
info.cpu_usage = info.cpu_usage =
static_cast<float *>(malloc((info.cpu_count + 1) * sizeof(float))); static_cast<float *>(malloc((info.cpu_count + 1) * sizeof(float)));
if (info.cpu_usage == nullptr) { CRIT_ERR(nullptr, nullptr, "malloc"); } if (info.cpu_usage == nullptr) { CRIT_ERR("malloc"); }
} }
} }

6
src/display-x11.cc
View File

@ -866,7 +866,7 @@ void display_output_x11::load_fonts(bool utf8) {
continue; continue;
} }
CRIT_ERR(nullptr, nullptr, "can't load Xft font '%s'", "courier-12"); CRIT_ERR("can't load Xft font '%s'", "courier-12");
continue; continue;
} }
@ -883,7 +883,7 @@ void display_output_x11::load_fonts(bool utf8) {
xfont.fontset = XCreateFontSet(display, "fixed", &missing, &missingnum, xfont.fontset = XCreateFontSet(display, "fixed", &missing, &missingnum,
&missingdrawn); &missingdrawn);
if (xfont.fontset == nullptr) { if (xfont.fontset == nullptr) {
CRIT_ERR(nullptr, nullptr, "can't load font '%s'", "fixed"); CRIT_ERR("can't load font '%s'", "fixed");
} }
} }
} }
@ -892,7 +892,7 @@ void display_output_x11::load_fonts(bool utf8) {
(xfont.font = XLoadQueryFont(display, font.name.c_str())) == nullptr) { (xfont.font = XLoadQueryFont(display, font.name.c_str())) == nullptr) {
NORM_ERR("can't load font '%s'", font.name.c_str()); NORM_ERR("can't load font '%s'", font.name.c_str());
if ((xfont.font = XLoadQueryFont(display, "fixed")) == nullptr) { if ((xfont.font = XLoadQueryFont(display, "fixed")) == nullptr) {
CRIT_ERR(nullptr, nullptr, "can't load font '%s'", "fixed"); CRIT_ERR("can't load font '%s'", "fixed");
} }
} }
} }

2
src/dragonfly.cc
View File

@ -279,7 +279,7 @@ void get_cpu_count(void) {
} }
info.cpu_usage = (float *)malloc((info.cpu_count + 1) * sizeof(float)); info.cpu_usage = (float *)malloc((info.cpu_count + 1) * sizeof(float));
if (info.cpu_usage == nullptr) { CRIT_ERR(nullptr, NULL, "malloc"); } if (info.cpu_usage == nullptr) { CRIT_ERR("malloc"); }
} }
struct cpu_info { struct cpu_info {

2
src/freebsd.cc
View File

@ -309,7 +309,7 @@ void get_cpu_count(void) {
} }
info.cpu_usage = (float *)malloc((info.cpu_count + 1) * sizeof(float)); info.cpu_usage = (float *)malloc((info.cpu_count + 1) * sizeof(float));
if (info.cpu_usage == nullptr) { CRIT_ERR(nullptr, NULL, "malloc"); } if (info.cpu_usage == nullptr) { CRIT_ERR("malloc"); }
} }
struct cpu_info { struct cpu_info {

4
src/fs.cc
View File

@ -192,14 +192,14 @@ void get_fs_type(const char *path, char *result) {
fseek(mtab, 0, SEEK_SET); fseek(mtab, 0, SEEK_SET);
slash = strrchr(search_path, '/'); slash = strrchr(search_path, '/');
if (slash == nullptr) { if (slash == nullptr) {
CRIT_ERR(NULL, NULL, "invalid path '%s'", path); CRIT_ERR("invalid path '%s'", path);
} else { } else {
if (strlen(slash) == 1) /* trailing slash */ if (strlen(slash) == 1) /* trailing slash */
*(slash) = '\0'; *(slash) = '\0';
else if (strlen(slash) > 1) else if (strlen(slash) > 1)
*(slash + 1) = '\0'; *(slash + 1) = '\0';
else else
CRIT_ERR(nullptr, NULL, "found a crack in the matrix!"); CRIT_ERR("found a crack in the matrix!");
} }
} while (strlen(search_path) > 0); } while (strlen(search_path) > 0);
free(search_path); free(search_path);

6
src/haiku.cc
View File

@ -97,7 +97,7 @@ void get_cpu_count(void) {
info.cpu_count = si.cpu_count; info.cpu_count = si.cpu_count;
info.cpu_usage = (float *)malloc((info.cpu_count + 1) * sizeof(float)); info.cpu_usage = (float *)malloc((info.cpu_count + 1) * sizeof(float));
if (info.cpu_usage == nullptr) { CRIT_ERR(nullptr, NULL, "malloc"); } if (info.cpu_usage == nullptr) { CRIT_ERR("malloc"); }
} }
int update_cpu_usage() { int update_cpu_usage() {
@ -117,14 +117,14 @@ int update_cpu_usage() {
if (!prev_cpuinfo) { if (!prev_cpuinfo) {
prev_cpuinfo = (cpu_info *)malloc(malloc_cpu_size); prev_cpuinfo = (cpu_info *)malloc(malloc_cpu_size);
if (prev_cpuinfo == nullptr) { CRIT_ERR(nullptr, NULL, "malloc"); } if (prev_cpuinfo == nullptr) { CRIT_ERR("malloc"); }
memset(prev_cpuinfo, 0, malloc_cpu_size); memset(prev_cpuinfo, 0, malloc_cpu_size);
} }
cpuinfo = (cpu_info *)malloc(malloc_cpu_size); cpuinfo = (cpu_info *)malloc(malloc_cpu_size);
memset(cpuinfo, 0, malloc_cpu_size); memset(cpuinfo, 0, malloc_cpu_size);
if (cpuinfo == nullptr) { CRIT_ERR(nullptr, NULL, "malloc"); } if (cpuinfo == nullptr) { CRIT_ERR("malloc"); }
now = system_time(); now = system_time();
if (get_cpu_info(0, info.cpu_count, &cpuinfo[1]) == B_OK) { if (get_cpu_info(0, info.cpu_count, &cpuinfo[1]) == B_OK) {

40
src/ibm.cc
View File

@ -93,10 +93,10 @@ void get_ibm_acpi_fan(struct text_object *obj, char *p,
if (sscanf(line, "speed: %u", &speed)) { break; } if (sscanf(line, "speed: %u", &speed)) { break; }
} }
} else { } else {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"can't open '%s': %s\nYou are not using the IBM ACPI. Remove " "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
"ibm* from your " PACKAGE_NAME " config file.", "ibm* from your " PACKAGE_NAME " config file.",
fan, strerror(errno)); fan, strerror(errno));
} }
fclose(fp); fclose(fp);
@ -144,10 +144,10 @@ int get_ibm_acpi_temps(void) {
} }
} }
} else { } else {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"can't open '%s': %s\nYou are not using the IBM ACPI. Remove " "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
"ibm* from your " PACKAGE_NAME " config file.", "ibm* from your " PACKAGE_NAME " config file.",
thermal, strerror(errno)); thermal, strerror(errno));
} }
fclose(fp); fclose(fp);
@ -191,10 +191,10 @@ void get_ibm_acpi_volume(struct text_object *obj, char *p,
if (sscanf(line, "mute: %s", mute)) { break; } if (sscanf(line, "mute: %s", mute)) { break; }
} }
} else { } else {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"can't open '%s': %s\nYou are not using the IBM ACPI. Remove " "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
"ibm* from your " PACKAGE_NAME " config file.", "ibm* from your " PACKAGE_NAME " config file.",
volume, strerror(errno)); volume, strerror(errno));
} }
fclose(fp); fclose(fp);
@ -235,10 +235,10 @@ void get_ibm_acpi_brightness(struct text_object *obj, char *p,
if (sscanf(line, "level: %u", &brightness)) { break; } if (sscanf(line, "level: %u", &brightness)) { break; }
} }
} else { } else {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"can't open '%s': %s\nYou are not using the IBM ACPI. Remove " "can't open '%s': %s\nYou are not using the IBM ACPI. Remove "
"ibm* from your " PACKAGE_NAME " config file.", "ibm* from your " PACKAGE_NAME " config file.",
filename, strerror(errno)); filename, strerror(errno));
} }
fclose(fp); fclose(fp);
@ -275,10 +275,10 @@ void get_ibm_acpi_thinklight(struct text_object *obj, char *p,
if (sscanf(line, "status: %s", thinklight)) { break; } if (sscanf(line, "status: %s", thinklight)) { break; }
} }
} else { } else {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"can't open '%s': %s\nYou are not using the IBM " "can't open '%s': %s\nYou are not using the IBM "
"ACPI. Remove ibm* from your " PACKAGE_NAME " config file.", "ACPI. Remove ibm* from your " PACKAGE_NAME " config file.",
filename, strerror(errno)); filename, strerror(errno));
} }
fclose(fp); fclose(fp);

6
src/ical.cc
View File

@ -111,14 +111,14 @@ void parse_ical_args(struct text_object *obj, const char *arg,
if (sscanf(arg, "%d %s", &num, filename) != 2) { if (sscanf(arg, "%d %s", &num, filename) != 2) {
free(filename); free(filename);
free(obj); free(obj);
CRIT_ERR(free_at_crash, free_at_crash2, CRIT_ERR_FREE(free_at_crash, free_at_crash2,
"wrong number of arguments for $ical"); "wrong number of arguments for $ical");
} }
file = fopen(filename, "r"); file = fopen(filename, "r");
if (!file) { if (!file) {
free(obj); free(obj);
free(free_at_crash); free(free_at_crash);
CRIT_ERR(filename, free_at_crash2, "Can't read file %s", filename); CRIT_ERR_FREE(filename, free_at_crash2, "Can't read file %s", filename);
return; return;
} }
free(filename); free(filename);

12
src/iconv_tools.cc
View File

@ -44,9 +44,9 @@ static iconv_t **iconv_cd = 0;
int register_iconv(iconv_t *new_iconv) { int register_iconv(iconv_t *new_iconv) {
iconv_cd = (void ***)realloc(iconv_cd, sizeof(iconv_t *) * (iconv_count + 1)); iconv_cd = (void ***)realloc(iconv_cd, sizeof(iconv_t *) * (iconv_count + 1));
if (!iconv_cd) { CRIT_ERR(nullptr, NULL, "Out of memory"); } if (!iconv_cd) { CRIT_ERR("Out of memory"); }
iconv_cd[iconv_count] = (void **)malloc(sizeof(iconv_t)); iconv_cd[iconv_count] = (void **)malloc(sizeof(iconv_t));
if (!iconv_cd[iconv_count]) { CRIT_ERR(nullptr, NULL, "Out of memory"); } if (!iconv_cd[iconv_count]) { CRIT_ERR("Out of memory"); }
memcpy(iconv_cd[iconv_count], new_iconv, sizeof(iconv_t)); memcpy(iconv_cd[iconv_count], new_iconv, sizeof(iconv_t));
iconv_count++; iconv_count++;
return iconv_count; return iconv_count;
@ -110,12 +110,12 @@ void init_iconv_start(struct text_object *obj, void *free_at_crash,
char iconv_to[ICONV_CODEPAGE_LENGTH]; char iconv_to[ICONV_CODEPAGE_LENGTH];
if (iconv_converting) { if (iconv_converting) {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"You must stop your last iconv conversion before " "You must stop your last iconv conversion before "
"starting another"); "starting another");
} }
if (sscanf(arg, "%s %s", iconv_from, iconv_to) != 2) { if (sscanf(arg, "%s %s", iconv_from, iconv_to) != 2) {
CRIT_ERR(obj, free_at_crash, "Invalid arguments for iconv_start"); CRIT_ERR_FREE(obj, free_at_crash, "Invalid arguments for iconv_start");
} else { } else {
iconv_t new_iconv; iconv_t new_iconv;

21
src/journal.cc
View File

@ -66,10 +66,11 @@ void init_journal(const char *type, const char *arg, struct text_object *obj,
args = sscanf(arg, "%d %6s", &j->wantedlines, tmp.get()); args = sscanf(arg, "%d %6s", &j->wantedlines, tmp.get());
if (args < 1 || args > 2) { if (args < 1 || args > 2) {
free_journal(obj); free_journal(obj);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(
"%s a number of lines as 1st argument and optionally a journal " obj, free_at_crash,
"type as 2nd argument", "%s a number of lines as 1st argument and optionally a journal "
type); "type as 2nd argument",
type);
} }
if (j->wantedlines > 0 && j->wantedlines <= MAX_JOURNAL_LINES) { if (j->wantedlines > 0 && j->wantedlines <= MAX_JOURNAL_LINES) {
if (args > 1) { if (args > 1) {
@ -81,8 +82,9 @@ void init_journal(const char *type, const char *arg, struct text_object *obj,
#endif /* SD_JOURNAL_CURRENT_USER */ #endif /* SD_JOURNAL_CURRENT_USER */
} else { } else {
free_journal(obj); free_journal(obj);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"invalid arg for %s, type must be 'system' or 'user'", type); "invalid arg for %s, type must be 'system' or 'user'",
type);
} }
} else { } else {
NORM_ERR("You should type a 'user' or 'system' as an argument"); NORM_ERR("You should type a 'user' or 'system' as an argument");
@ -90,9 +92,10 @@ void init_journal(const char *type, const char *arg, struct text_object *obj,
} else { } else {
free_journal(obj); free_journal(obj);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(
"invalid arg for %s, number of lines must be between 1 and %d", obj, free_at_crash,
type, MAX_JOURNAL_LINES); "invalid arg for %s, number of lines must be between 1 and %d", type,
MAX_JOURNAL_LINES);
} }
obj->data.opaque = j; obj->data.opaque = j;
} }

12
src/logging.h
View File

@ -79,10 +79,10 @@ void NORM_ERR(const char *format, Args &&...args) {
fputs("\n", stderr); fputs("\n", stderr);
} }
/* critical error */ /* critical error with additional cleanup */
template <typename... Args> template <typename... Args>
inline void CRIT_ERR(void *memtofree1, void *memtofree2, const char *format, inline void CRIT_ERR_FREE(void *memtofree1, void *memtofree2,
Args &&...args) { const char *format, Args &&...args) {
NORM_ERR(format, args...); NORM_ERR(format, args...);
free(memtofree1); free(memtofree1);
free(memtofree2); free(memtofree2);
@ -90,6 +90,12 @@ inline void CRIT_ERR(void *memtofree1, void *memtofree2, const char *format,
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* critical error */
template <typename... Args>
inline void CRIT_ERR(const char *format, Args &&...args) {
CRIT_ERR_FREE(nullptr, nullptr, format, args...);
}
namespace conky { namespace conky {
class error : public std::runtime_error { class error : public std::runtime_error {
public: public:

2
src/main.cc
View File

@ -317,7 +317,7 @@ int main(int argc, char **argv) {
break; break;
case 'q': case 'q':
if (freopen("/dev/null", "w", stderr) == nullptr) { if (freopen("/dev/null", "w", stderr) == nullptr) {
CRIT_ERR(nullptr, nullptr, "could not open /dev/null as stderr!"); CRIT_ERR("could not open /dev/null as stderr!");
} }
break; break;
case 'h': case 'h':

11
src/mboxscan.cc
View File

@ -137,10 +137,10 @@ static void mbox_scan(char *args, char *output, size_t max_len) {
free(copy_args); free(copy_args);
} }
if (strlen(mbox_mail_spool) < 1) { if (strlen(mbox_mail_spool) < 1) {
CRIT_ERR(nullptr, nullptr, CRIT_ERR(
"Usage: ${mboxscan [-n <number of messages to print>] " "Usage: ${mboxscan [-n <number of messages to print>] "
"[-fw <from width>] [-sw <subject width>] " "[-fw <from width>] [-sw <subject width>] "
"[-t <delay in sec> mbox]}"); "[-t <delay in sec> mbox]}");
} }
/* allowing $MAIL in the config */ /* allowing $MAIL in the config */
@ -150,8 +150,7 @@ static void mbox_scan(char *args, char *output, size_t max_len) {
} }
if (stat(mbox_mail_spool, &statbuf) != 0) { if (stat(mbox_mail_spool, &statbuf) != 0) {
CRIT_ERR(nullptr, nullptr, "can't stat %s: %s", mbox_mail_spool, CRIT_ERR("can't stat %s: %s", mbox_mail_spool, strerror(errno));
strerror(errno));
} }
args_ok = 1; /* args-computing necessary only once */ args_ok = 1; /* args-computing necessary only once */
} }

2
src/net_stat.cc
View File

@ -530,7 +530,7 @@ int interface_up(struct text_object *obj) {
#else #else
if ((fd = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0) { if ((fd = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0) {
#endif #endif
CRIT_ERR(nullptr, nullptr, "could not create sockfd"); CRIT_ERR("could not create sockfd");
return 0; return 0;
} }
strncpy(ifr.ifr_name, dev, IFNAMSIZ); strncpy(ifr.ifr_name, dev, IFNAMSIZ);

12
src/nvidia.cc
View File

@ -1150,10 +1150,10 @@ double get_nvidia_barval(struct text_object *obj) {
case ATTR_FREQS_STRING: // mtrfreq (calculate out of memfreqmax) case ATTR_FREQS_STRING: // mtrfreq (calculate out of memfreqmax)
if (strcmp(nvs->token, "memTransferRate") != 0) { if (strcmp(nvs->token, "memTransferRate") != 0) {
// Just in case error for silly devs // Just in case error for silly devs
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"%s: attribute is 'ATTR_FREQS_STRING' but token is not " "%s: attribute is 'ATTR_FREQS_STRING' but token is not "
"\"memTransferRate\" (arg: '%s')", "\"memTransferRate\" (arg: '%s')",
nvs->command, nvs->arg); nvs->command, nvs->arg);
return 0; return 0;
} }
temp1 = temp1 =
@ -1171,8 +1171,8 @@ double get_nvidia_barval(struct text_object *obj) {
break; break;
default: // Throw error if unsupported args are used default: // Throw error if unsupported args are used
CRIT_ERR(nullptr, NULL, "%s: invalid argument specified: '%s'", CRIT_ERR("%s: invalid argument specified: '%s'", nvs->command,
nvs->command, nvs->arg); nvs->arg);
} }
} }

4
src/openbsd.cc
View File

@ -310,13 +310,13 @@ void get_cpu_count() {
info.cpu_count = cpu_count; info.cpu_count = cpu_count;
info.cpu_usage = malloc(info.cpu_count * sizeof(float)); info.cpu_usage = malloc(info.cpu_count * sizeof(float));
if (info.cpu_usage == nullptr) { CRIT_ERR(nullptr, NULL, "malloc"); } if (info.cpu_usage == nullptr) { CRIT_ERR("malloc"); }
#ifndef OLDCPU #ifndef OLDCPU
assert(fresh == nullptr); /* XXX Is this leaking memory? */ assert(fresh == nullptr); /* XXX Is this leaking memory? */
/* XXX Where shall I free this? */ /* XXX Where shall I free this? */
if (nullptr == (fresh = calloc(cpu_count, sizeof(int64_t) * CPUSTATES))) { if (nullptr == (fresh = calloc(cpu_count, sizeof(int64_t) * CPUSTATES))) {
CRIT_ERR(nullptr, NULL, "calloc"); CRIT_ERR("calloc");
} }
#endif #endif
} }

2
src/proc.cc
View File

@ -439,7 +439,7 @@ void scan_cmdline_to_pid_arg(struct text_object *obj, const char *arg,
} }
if (obj->data.s[i - 1] == ' ') { obj->data.s[i - 1] = 0; } if (obj->data.s[i - 1] == ' ') { obj->data.s[i - 1] = 0; }
} else { } else {
CRIT_ERR(obj, free_at_crash, "${cmdline_to_pid commandline}"); CRIT_ERR_FREE(obj, free_at_crash, "${cmdline_to_pid commandline}");
} }
} }

2
src/pulseaudio.cc
View File

@ -221,7 +221,7 @@ void init_pulseaudio(struct text_object *obj) {
// This function connects to the pulse server // This function connects to the pulse server
if (pa_context_connect(pulseaudio->context, nullptr, (pa_context_flags_t)0, if (pa_context_connect(pulseaudio->context, nullptr, (pa_context_flags_t)0,
nullptr) < 0) { nullptr) < 0) {
CRIT_ERR(nullptr, NULL, "Cannot connect to pulseaudio"); CRIT_ERR("Cannot connect to pulseaudio");
return; return;
} }
pa_threaded_mainloop_start(pulseaudio->mainloop); pa_threaded_mainloop_start(pulseaudio->mainloop);

11
src/read_tcpip.cc
View File

@ -65,8 +65,9 @@ void parse_read_tcpip_arg(struct text_object *obj, const char *arg,
strncpy(rtd->host, "localhost", 10); strncpy(rtd->host, "localhost", 10);
} }
if (rtd->port < 1 || rtd->port > 65535) { if (rtd->port < 1 || rtd->port > 65535) {
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(
"read_tcp and read_udp need a port from 1 to 65535 as argument"); obj, free_at_crash,
"read_tcp and read_udp need a port from 1 to 65535 as argument");
} }
obj->data.opaque = rtd; obj->data.opaque = rtd;
@ -91,15 +92,15 @@ void parse_tcp_ping_arg(struct text_object *obj, const char *arg,
break; break;
default: // this point should never be reached default: // this point should never be reached
free(hostname); free(hostname);
CRIT_ERR(obj, free_at_crash, "tcp_ping: Reading arguments failed"); CRIT_ERR_FREE(obj, free_at_crash, "tcp_ping: Reading arguments failed");
} }
if ((he = gethostbyname(hostname)) == nullptr) { if ((he = gethostbyname(hostname)) == nullptr) {
NORM_ERR("tcp_ping: Problem with resolving '%s', using 'localhost' instead", NORM_ERR("tcp_ping: Problem with resolving '%s', using 'localhost' instead",
hostname); hostname);
if ((he = gethostbyname("localhost")) == nullptr) { if ((he = gethostbyname("localhost")) == nullptr) {
free(hostname); free(hostname);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"tcp_ping: Resolving 'localhost' also failed"); "tcp_ping: Resolving 'localhost' also failed");
} }
} }
if (he != nullptr) { if (he != nullptr) {

6
src/scroll.cc
View File

@ -160,9 +160,9 @@ void parse_scroll_arg(struct text_object *obj, const char *arg,
free(obj->next); free(obj->next);
#endif #endif
free(free_at_crash2); free(free_at_crash2);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"scroll needs arguments: [left|right|wait] <length> [<step>] " "scroll needs arguments: [left|right|wait] <length> [<step>] "
"[interval] <text>"); "[interval] <text>");
} }
n1 += n2; n1 += n2;

8
src/sony.cc
View File

@ -64,10 +64,10 @@ void get_sony_fanspeed(struct text_object *obj, char *p_client_buffer,
if (sscanf(line, "%u", &speed)) { break; } if (sscanf(line, "%u", &speed)) { break; }
} }
} else { } else {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"can't open '%s': %s\nEnable sony support or remove " "can't open '%s': %s\nEnable sony support or remove "
"sony* from your " PACKAGE_NAME " config file.", "sony* from your " PACKAGE_NAME " config file.",
fan, strerror(errno)); fan, strerror(errno));
} }
fclose(fp); fclose(fp);

31
src/tailhead.cc
View File

@ -91,14 +91,14 @@ void init_tailhead(const char *type, const char *arg, struct text_object *obj,
args = sscanf(arg, "%s %d %d", tmp.get(), &ht->wantedlines, &ht->max_uses); args = sscanf(arg, "%s %d %d", tmp.get(), &ht->wantedlines, &ht->max_uses);
if (args < 2 || args > 3) { if (args < 2 || args > 3) {
free_tailhead(obj); free_tailhead(obj);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(
"%s needs a file as 1st and a number of lines as 2nd argument", obj, free_at_crash,
type); "%s needs a file as 1st and a number of lines as 2nd argument", type);
} }
if (ht->max_uses < 1) { if (ht->max_uses < 1) {
free_tailhead(obj); free_tailhead(obj);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(obj, free_at_crash,
"invalid arg for %s, next_check must be larger than 0", type); "invalid arg for %s, next_check must be larger than 0", type);
} }
if (ht->wantedlines > 0 && ht->wantedlines <= MAX_HEADTAIL_LINES) { if (ht->wantedlines > 0 && ht->wantedlines <= MAX_HEADTAIL_LINES) {
ht->logfile = to_real_path(tmp.get()); ht->logfile = to_real_path(tmp.get());
@ -106,9 +106,10 @@ void init_tailhead(const char *type, const char *arg, struct text_object *obj,
ht->current_use = 0; ht->current_use = 0;
} else { } else {
free_tailhead(obj); free_tailhead(obj);
CRIT_ERR(obj, free_at_crash, CRIT_ERR_FREE(
"invalid arg for %s, number of lines must be between 1 and %d", obj, free_at_crash,
type, MAX_HEADTAIL_LINES); "invalid arg for %s, number of lines must be between 1 and %d", type,
MAX_HEADTAIL_LINES);
} }
obj->data.opaque = ht; obj->data.opaque = ht;
} }
@ -147,9 +148,9 @@ static void print_tailhead(const char *type, struct text_object *obj, char *p,
i = read(fd, p, p_max_size - 1); i = read(fd, p, p_max_size - 1);
tailstring(p, i, ht->wantedlines); tailstring(p, i, ht->wantedlines);
} else { } else {
CRIT_ERR(nullptr, nullptr, CRIT_ERR(
"If you are seeing this then there is a bug in the code, " "If you are seeing this then there is a bug in the code, "
"report it !"); "report it !");
} }
} }
close(fd); close(fd);
@ -169,16 +170,16 @@ static void print_tailhead(const char *type, struct text_object *obj, char *p,
i = fread(p, 1, p_max_size - 1, fp); i = fread(p, 1, p_max_size - 1, fp);
tailstring(p, i, ht->wantedlines); tailstring(p, i, ht->wantedlines);
} else { } else {
CRIT_ERR(nullptr, nullptr, CRIT_ERR(
"If you are seeing this then there is a bug in the code, " "If you are seeing this then there is a bug in the code, "
"report it !"); "report it !");
} }
fclose(fp); fclose(fp);
} }
} }
ht->buffer = strdup(p); ht->buffer = strdup(p);
} else { } else {
CRIT_ERR(nullptr, nullptr, "$%s can't find information about %s", type, CRIT_ERR("$%s can't find information about %s", type,
ht->logfile.c_str()); ht->logfile.c_str());
} }
} }

30
src/tcp-portmon.cc
View File

@ -44,15 +44,14 @@ int tcp_portmon_init(struct text_object *obj, const char *arg) {
argc = sscanf(arg, "%d %d %31s %d", &port_begin, &port_end, itembuf, argc = sscanf(arg, "%d %d %31s %d", &port_begin, &port_end, itembuf,
&connection_index); &connection_index);
if ((argc != 3) && (argc != 4)) { if ((argc != 3) && (argc != 4)) {
CRIT_ERR(nullptr, NULL, "tcp_portmon: requires 3 or 4 arguments"); CRIT_ERR("tcp_portmon: requires 3 or 4 arguments");
} }
if ((port_begin < 1) || (port_begin > 65535) || (port_end < 1) || if ((port_begin < 1) || (port_begin > 65535) || (port_end < 1) ||
(port_end > 65535)) { (port_end > 65535)) {
CRIT_ERR(nullptr, NULL, "tcp_portmon: port values must be from 1 to 65535"); CRIT_ERR("tcp_portmon: port values must be from 1 to 65535");
} }
if (port_begin > port_end) { if (port_begin > port_end) {
CRIT_ERR(nullptr, NULL, CRIT_ERR("tcp_portmon: starting port must be <= ending port");
"tcp_portmon: starting port must be <= ending port");
} }
if (strncmp(itembuf, "count", 31) == EQUAL) { if (strncmp(itembuf, "count", 31) == EQUAL) {
item = COUNT; item = COUNT;
@ -73,16 +72,15 @@ int tcp_portmon_init(struct text_object *obj, const char *arg) {
} else if (strncmp(itembuf, "lservice", 31) == EQUAL) { } else if (strncmp(itembuf, "lservice", 31) == EQUAL) {
item = LOCALSERVICE; item = LOCALSERVICE;
} else { } else {
CRIT_ERR(nullptr, NULL, "tcp_portmon: invalid item specified"); CRIT_ERR("tcp_portmon: invalid item specified");
} }
if ((argc == 3) && (item != COUNT)) { if ((argc == 3) && (item != COUNT)) {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"tcp_portmon: 3 argument form valid only for \"count\" " "tcp_portmon: 3 argument form valid only for \"count\" "
"item"); "item");
} }
if ((argc == 4) && (connection_index < 0)) { if ((argc == 4) && (connection_index < 0)) {
CRIT_ERR(nullptr, NULL, CRIT_ERR("tcp_portmon: connection index must be non-negative");
"tcp_portmon: connection index must be non-negative");
} }
/* ok, args looks good. save the text object data */ /* ok, args looks good. save the text object data */
pmd = (tcp_port_monitor_data *)malloc(sizeof(struct tcp_port_monitor_data)); pmd = (tcp_port_monitor_data *)malloc(sizeof(struct tcp_port_monitor_data));
@ -98,9 +96,9 @@ int tcp_portmon_init(struct text_object *obj, const char *arg) {
if (!pmc) { if (!pmc) {
pmc = create_tcp_port_monitor_collection(); pmc = create_tcp_port_monitor_collection();
if (!pmc) { if (!pmc) {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"tcp_portmon: unable to create port monitor " "tcp_portmon: unable to create port monitor "
"collection"); "collection");
} }
} }
@ -114,9 +112,9 @@ int tcp_portmon_init(struct text_object *obj, const char *arg) {
/* add the newly created monitor to the collection */ /* add the newly created monitor to the collection */
if (insert_new_tcp_port_monitor_into_collection(pmc, port_begin, port_end, if (insert_new_tcp_port_monitor_into_collection(pmc, port_begin, port_end,
&pma) != 0) { &pma) != 0) {
CRIT_ERR(nullptr, NULL, CRIT_ERR(
"tcp_portmon: unable to add port monitor to " "tcp_portmon: unable to add port monitor to "
"collection"); "collection");
} }
} }
return 0; return 0;

5
src/template.cc
View File

@ -77,7 +77,7 @@ static char *backslash_escape(const char *src, char **templates,
break; break;
} }
if (tmpl_num == 0) { if (tmpl_num == 0) {
CRIT_ERR( CRIT_ERR_FREE(
nullptr, nullptr, nullptr, nullptr,
"invalid template argument \\0; arguments must start at \\1"); "invalid template argument \\0; arguments must start at \\1");
} }
@ -210,8 +210,7 @@ char *find_and_replace_templates(const char *inbuf) {
*(p - 1) = '\0'; *(p - 1) = '\0';
} else { } else {
// we ran into the end of string without finding a closing }, bark // we ran into the end of string without finding a closing }, bark
CRIT_ERR(nullptr, nullptr, CRIT_ERR("cannot find a closing '}' in template expansion");
"cannot find a closing '}' in template expansion");
} }
} else { } else {
templ = p + 1; templ = p + 1;

10
src/text_object.cc
View File

@ -72,9 +72,7 @@ int append_object(struct text_object *root, struct text_object *obj) {
/* update pointers of the list to append to */ /* update pointers of the list to append to */
if (end != nullptr) { if (end != nullptr) {
if (end->next != nullptr) { if (end->next != nullptr) { CRIT_ERR("huston, we have a lift-off"); }
CRIT_ERR(nullptr, nullptr, "huston, we have a lift-off");
}
end->next = obj; end->next = obj;
} else { } else {
root->next = obj; root->next = obj;
@ -124,7 +122,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top,
switch (type) { switch (type) {
case IFBLOCK_ENDIF: case IFBLOCK_ENDIF:
if ((*ifblock_stack_top) == nullptr) { if ((*ifblock_stack_top) == nullptr) {
CRIT_ERR(nullptr, nullptr, "got an endif without matching if"); CRIT_ERR("got an endif without matching if");
} }
(*ifblock_stack_top)->obj->ifblock_next = obj; (*ifblock_stack_top)->obj->ifblock_next = obj;
/* if there's some else in between, remove and free it */ /* if there's some else in between, remove and free it */
@ -140,7 +138,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top,
break; break;
case IFBLOCK_ELSE: case IFBLOCK_ELSE:
if ((*ifblock_stack_top) == nullptr) { if ((*ifblock_stack_top) == nullptr) {
CRIT_ERR(nullptr, nullptr, "got an else without matching if"); CRIT_ERR("got an else without matching if");
} }
(*ifblock_stack_top)->obj->ifblock_next = obj; (*ifblock_stack_top)->obj->ifblock_next = obj;
/* falls through */ /* falls through */
@ -153,7 +151,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top,
*ifblock_stack_top = stackobj; *ifblock_stack_top = stackobj;
break; break;
default: default:
CRIT_ERR(nullptr, nullptr, "push_ifblock() misuse detected!"); CRIT_ERR("push_ifblock() misuse detected!");
} }
return 0; return 0;
} }