projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup compiler warnings
[lttng-tools.git]
/
ltt-sessiond
/
main.c
diff --git
a/ltt-sessiond/main.c
b/ltt-sessiond/main.c
index d104830667dd6cf9efc040584a5c18c4293381c9..567742ebb783bc1a4bfdf9f6ff89ddc8193f1604 100644
(file)
--- a/
ltt-sessiond/main.c
+++ b/
ltt-sessiond/main.c
@@
-119,9
+119,11
@@
static gid_t allowed_group(void)
{
struct group *grp;
{
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 {
if (!grp) {
return -1;
} else {
@@
-2439,8
+2441,6
@@
end:
*/
static int check_existing_daemon(void)
{
*/
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;
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;
static int set_permissions(void)
{
int ret;
- struct group *grp;
gid_t gid;
gid = allowed_group();
gid_t gid;
gid = allowed_group();
This page took
0.023782 seconds
and
4
git commands to generate.