circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

xfree is not particularly helpful, remove it. From Thomas Adam.

Browse Source
This commit is contained in:
Nicholas Marriott
2012-07-10 11:53:01 +00:00
parent a3391692ad
commit df912e3540
73 changed files with 329 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tmux.c
View File

@ -73,7 +73,7 @@ logfile(const char *name)
if (debug_level > 0) {
xasprintf(&path, "tmux-%s-%ld.log", name, (long) getpid());
log_open(debug_level, path);
xfree(path);
free(path);
}
}
@ -252,8 +252,7 @@ main(int argc, char **argv)
flags &= ~IDENTIFY_256COLOURS;
break;
case 'c':
if (shell_cmd != NULL)
xfree(shell_cmd);
free(shell_cmd);
shell_cmd = xstrdup(optarg);
break;
case 'C':
@ -263,24 +262,21 @@ main(int argc, char **argv)
flags |= IDENTIFY_CONTROL;
break;
case 'f':
if (cfg_file != NULL)
xfree(cfg_file);
free(cfg_file);
cfg_file = xstrdup(optarg);
break;
case 'l':
login_shell = 1;
break;
case 'L':
if (label != NULL)
xfree(label);
free(label);
label = xstrdup(optarg);
break;
case 'q':
quiet = 1;
break;
case 'S':
if (path != NULL)
xfree(path);
free(path);
path = xstrdup(optarg);
break;
case 'u':
@ -360,7 +356,7 @@ main(int argc, char **argv)
}
xasprintf(&cfg_file, "%s/%s", home, DEFAULT_CFG);
if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
xfree(cfg_file);
free(cfg_file);
cfg_file = NULL;
}
}
@ -387,11 +383,10 @@ main(int argc, char **argv)
}
}
}
if (label != NULL)
xfree(label);
free(label);
if (realpath(path, socket_path) == NULL)
strlcpy(socket_path, path, sizeof socket_path);
xfree(path);
free(path);
/* Set process title. */
setproctitle("%s (%s)", __progname, socket_path);