little coding style fixes, fix compilation warning

This commit is contained in:
Michael Stapelberg
2011-03-21 23:54:13 +01:00
parent f0f7cb7478
commit 4fd4e619ec
3 changed files with 18 additions and 12 deletions

View File

@ -260,11 +260,12 @@ int main(int argc, char *argv[]) {
exit(0);
}
if (config.ipc_socket_path == NULL) {
if (config.ipc_socket_path == NULL)
config.ipc_socket_path = getenv("I3SOCK");
if (config.ipc_socket_path == NULL)
config.ipc_socket_path = get_process_filename("i3-ipc-socket");
}
/* Fall back to a file name in /tmp/ based on the PID */
if (config.ipc_socket_path == NULL)
config.ipc_socket_path = get_process_filename("i3-ipc-socket");
uint32_t mask = XCB_CW_EVENT_MASK;
uint32_t values[] = { XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT |