consolidate cleanup gotos
This commit is contained in:
parent
a3059b30ba
commit
7f3727d2f1
|
|
@ -98,7 +98,7 @@ int main(int argc, char** argv)
|
||||||
if(!xdgInitHandle(&xdg))
|
if(!xdgInitHandle(&xdg))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Function xdgInitHandle() failed, is $HOME unset?\n");
|
fprintf(stderr, "Function xdgInitHandle() failed, is $HOME unset?\n");
|
||||||
goto cleanup;
|
goto cleanup_final;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* config_home_str = xdgConfigHome(&xdg);
|
const char* config_home_str = xdgConfigHome(&xdg);
|
||||||
|
|
@ -152,6 +152,7 @@ int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
slog_disable(SLOG_DEBUG);
|
slog_disable(SLOG_DEBUG);
|
||||||
}
|
}
|
||||||
|
xdgWipeHandle(&xdg);
|
||||||
|
|
||||||
slogi("checking for diameters config");
|
slogi("checking for diameters config");
|
||||||
char* diameters_file_str;
|
char* diameters_file_str;
|
||||||
|
|
@ -172,7 +173,7 @@ int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg), config_error_line(&cfg), config_error_text(&cfg));
|
fprintf(stderr, "%s:%d - %s\n", config_error_file(&cfg), config_error_line(&cfg), config_error_text(&cfg));
|
||||||
config_destroy(&cfg);
|
config_destroy(&cfg);
|
||||||
goto cleanup;
|
goto cleanup_final;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -314,8 +315,6 @@ int main(int argc, char** argv)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
xdgWipeHandle(&xdg);
|
|
||||||
cleanup_final:
|
cleanup_final:
|
||||||
monocoquesettingsfree(ms);
|
monocoquesettingsfree(ms);
|
||||||
free(ms);
|
free(ms);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue