Cleanup compiler warnings
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 8 Aug 2011 15:08:29 +0000 (11:08 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Mon, 8 Aug 2011 15:08:29 +0000 (11:08 -0400)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
ltt-sessiond/main.c

index d104830667dd6cf9efc040584a5c18c4293381c9..567742ebb783bc1a4bfdf9f6ff89ddc8193f1604 100644 (file)
@@ -119,9 +119,11 @@ static gid_t allowed_group(void)
 {
        struct group *grp;
 
-       grp = (opt_tracing_group != NULL) ?
-               (grp = getgrnam(opt_tracing_group)) :
-               (grp = getgrnam(default_tracing_group));
+       if (opt_tracing_group) {
+               grp = getgrnam(opt_tracing_group);
+       } else {
+               grp = getgrnam(default_tracing_group);
+       }
        if (!grp) {
                return -1;
        } else {
@@ -2439,8 +2441,6 @@ end:
  */
 static int check_existing_daemon(void)
 {
-       int ret;
-
        if (access(client_unix_sock_path, F_OK) < 0 &&
            access(apps_unix_sock_path, F_OK) < 0)
                return 0;
@@ -2460,7 +2460,6 @@ static int check_existing_daemon(void)
 static int set_permissions(void)
 {
        int ret;
-       struct group *grp;
        gid_t gid;
 
        gid = allowed_group();
This page took 0.027789 seconds and 4 git commands to generate.