nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3574 from pclouds/no-newline-in-errx 

Remove \n from errx and die messages
This commit is contained in:
Orestis 2019-01-02 14:30:17 +02:00 committed by GitHub
parent 3e3257af18 6462cf1ca3
commit 00bb9a8483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3-config-wizard/main.c
View File

@ -822,7 +822,7 @@ int main(int argc, char *argv[]) {
int screen; int screen;
if ((conn = xcb_connect(NULL, &screen)) == NULL || if ((conn = xcb_connect(NULL, &screen)) == NULL ||
xcb_connection_has_error(conn)) xcb_connection_has_error(conn))
errx(1, "Cannot open display\n"); errx(1, "Cannot open display");
if (xkb_x11_setup_xkb_extension(conn, if (xkb_x11_setup_xkb_extension(conn,
XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MAJOR_XKB_VERSION,
@ -859,7 +859,7 @@ int main(int argc, char *argv[]) {
root = root_screen->root; root = root_screen->root;
if (!(modmap_reply = xcb_get_modifier_mapping_reply(conn, modmap_cookie, NULL))) if (!(modmap_reply = xcb_get_modifier_mapping_reply(conn, modmap_cookie, NULL)))
errx(EXIT_FAILURE, "Could not get modifier mapping\n"); errx(EXIT_FAILURE, "Could not get modifier mapping");
xcb_numlock_mask = get_mod_mask_for(XCB_NUM_LOCK, symbols, modmap_reply); xcb_numlock_mask = get_mod_mask_for(XCB_NUM_LOCK, symbols, modmap_reply);
@ -899,7 +899,7 @@ int main(int argc, char *argv[]) {
do { \ do { \
xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, name##_cookie, NULL); \ xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, name##_cookie, NULL); \
if (!reply) \ if (!reply) \
errx(EXIT_FAILURE, "Could not get atom " #name "\n"); \ errx(EXIT_FAILURE, "Could not get atom " #name); \
\ \
A_##name = reply->atom; \ A_##name = reply->atom; \
free(reply); \ free(reply); \

2
i3-input/main.c
View File

@ -435,7 +435,7 @@ int main(int argc, char *argv[]) {
int screen; int screen;
conn = xcb_connect(NULL, &screen); conn = xcb_connect(NULL, &screen);
if (!conn || xcb_connection_has_error(conn)) if (!conn || xcb_connection_has_error(conn))
die("Cannot open display\n"); die("Cannot open display");
sockfd = ipc_connect(socket_path); sockfd = ipc_connect(socket_path);

4
i3-nagbar/main.c
View File

@ -418,7 +418,7 @@ int main(int argc, char *argv[]) {
int screens; int screens;
if ((conn = xcb_connect(NULL, &screens)) == NULL || if ((conn = xcb_connect(NULL, &screens)) == NULL ||
xcb_connection_has_error(conn)) xcb_connection_has_error(conn))
die("Cannot open display\n"); die("Cannot open display");
/* Place requests for the atoms we need as soon as possible */ /* Place requests for the atoms we need as soon as possible */
#define xmacro(atom) \ #define xmacro(atom) \
@ -512,7 +512,7 @@ int main(int argc, char *argv[]) {
do { \ do { \
xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, name##_cookie, NULL); \ xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(conn, name##_cookie, NULL); \
if (!reply) \ if (!reply) \
die("Could not get atom " #name "\n"); \ die("Could not get atom " #name); \
\ \
A_##name = reply->atom; \ A_##name = reply->atom; \
free(reply); \ free(reply); \

2
src/main.c
View File

@ -515,7 +515,7 @@ int main(int argc, char *argv[]) {
conn = xcb_connect(NULL, &conn_screen); conn = xcb_connect(NULL, &conn_screen);
if (xcb_connection_has_error(conn)) if (xcb_connection_has_error(conn))
errx(EXIT_FAILURE, "Cannot open display\n"); errx(EXIT_FAILURE, "Cannot open display");
sndisplay = sn_xcb_display_new(conn, NULL, NULL); sndisplay = sn_xcb_display_new(conn, NULL, NULL);

2
src/restore_layout.c
View File

@ -115,7 +115,7 @@ void restore_connect(void) {
#ifdef I3_ASAN_ENABLED #ifdef I3_ASAN_ENABLED
__lsan_do_leak_check(); __lsan_do_leak_check();
#endif #endif
errx(EXIT_FAILURE, "Cannot open display\n"); errx(EXIT_FAILURE, "Cannot open display");
} }
xcb_watcher = scalloc(1, sizeof(struct ev_io)); xcb_watcher = scalloc(1, sizeof(struct ev_io));

2
testcases/inject_randr1.5.c
View File

@ -402,7 +402,7 @@ int main(int argc, char *argv[]) {
} }
if (optind >= argc) { if (optind >= argc) {
errx(EXIT_FAILURE, "syntax: %s [options] <command>\n", argv[0]); errx(EXIT_FAILURE, "syntax: %s [options] <command>", argv[0]);
} }
int fd = socket(AF_LOCAL, SOCK_STREAM, 0); int fd = socket(AF_LOCAL, SOCK_STREAM, 0);