little coding style fixes, fix compilation warning

diff --git a/include/util.h b/include/util.h
index 514e10bde2884265fe59452c6de7b9202feda8a3..610e701e9e323c432654da13d2c05d397b42313c 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -104,7 +104,7 @@ void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie,
  */
 char *convert_utf8_to_ucs2(char *input, int *real_strlen);
 
-/*
+/**
  * This function resolves ~ in pathnames.
  * It may resolve wildcards in the first part of the path, but if no match
  * or multiple matches are found, it just returns a copy of path as given.
@@ -112,13 +112,20 @@ char *convert_utf8_to_ucs2(char *input, int *real_strlen);
  */
 char *resolve_tilde(const char *path);
 
-/*
+/**
  * Checks if the given path exists by calling stat().
  *
  */
 bool path_exists(const char *path);
 
-/*
+
+/**
+ * Returns the name of a temporary file with the specified prefix.
+ *
+ */
+char *get_process_filename(const char *prefix);
+
+/**
  * Restart i3 in-place
  * appends -a to argument list to disable autostart
  *

diff --git a/src/main.c b/src/main.c
index 2bda27c501fd0685a5f498f5e1960ac0e00fe809..a5a492e7aa0465b498a7af4d9aedd853394f3a88 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -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 |

diff --git a/src/util.c b/src/util.c
index 693027fa88b495692ef10b7626d31526cd60b0b7..2e4d9c2330ab5a44d97f3aac539c0f7ca5da9f50 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -243,8 +243,7 @@ static char **append_argument(char **original, char *argument) {
  * Returns the name of a temporary file with the specified prefix.
  *
  */
-char *get_process_filename(const char *prefix)
-{
+char *get_process_filename(const char *prefix) {
     struct passwd *pw = getpwuid(getuid());
     const char *username = pw ? pw->pw_name : "unknown";
     char *filename;
@@ -253,9 +252,8 @@ char *get_process_filename(const char *prefix)
         perror("asprintf()");
         return NULL;
     }
-    else {
-        return filename;
-    }
+
+    return filename;
 }
 
 #define y(x, ...) yajl_gen_ ## x (gen, ##__VA_ARGS__)