Skip to content
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

Jump to bottom

Some die messages missing newlines #520

Merged
merged 2 commits into from
Jan 28, 2024
Merged

Some die messages missing newlines #520

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb21196
Update i3status.c
coillteoir Jan 13, 2024
73873f0
asprintf
coillteoir Jan 14, 2024
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
8 changes: 4 additions & 4 deletions i3status.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static char *get_config_path(void) {

xdg_config_home = resolve_tilde(xdg_config_home);
if (asprintf(&config_path, "%s/i3status/config", xdg_config_home) == -1)
die("asprintf() failed");
die("asprintf() failed\n");
free(xdg_config_home);

if (path_exists(config_path))
Expand All @@ -213,7 +213,7 @@ static char *get_config_path(void) {
while (tok != NULL) {
tok = resolve_tilde(tok);
if (asprintf(&config_path, "%s/i3status/config", tok) == -1)
die("asprintf() failed");
die("asprintf() failed\n");
free(tok);
if (path_exists(config_path)) {
free(buf);
Expand Down Expand Up @@ -503,7 +503,7 @@ int main(int argc, char *argv[]) {
sigaction(SIGUSR1, &action, NULL);

if (setlocale(LC_ALL, "") == NULL)
die("Could not set locale. Please make sure all your LC_* / LANG settings are correct.");
die("Could not set locale. Please make sure all your LC_* / LANG settings are correct.\n");

while ((opt = getopt_long(argc, argv, "c:hv", long_options, &option_index)) != -1) {
switch (opt) {
Expand Down Expand Up @@ -585,7 +585,7 @@ int main(int argc, char *argv[]) {
separator = get_default_separator();

if (!valid_color(cfg_getstr(cfg_general, "color_good")) || !valid_color(cfg_getstr(cfg_general, "color_degraded")) || !valid_color(cfg_getstr(cfg_general, "color_bad")) || !valid_color(cfg_getstr(cfg_general, "color_separator")))
die("Bad color format");
die("Bad color format\n");

char *markup_str = cfg_getstr(cfg_general, "markup");
if (strcasecmp(markup_str, "pango") == 0)
Expand Down
Loading