mirror of
https://github.com/jarun/nnn.git
synced 2024-11-20 01:49:14 +00:00
checkpatch warning fixes
This commit is contained in:
parent
4fc8d1edd1
commit
f2ee21cdcd
16
src/nnn.c
16
src/nnn.c
|
@ -1039,7 +1039,8 @@ static void join(pid_t p, uchar flag)
|
|||
|
||||
if (!(flag & F_NOWAIT))
|
||||
/* wait for the child to exit */
|
||||
while (waitpid(p, &status, 0) == -1);
|
||||
do {
|
||||
} while (waitpid(p, &status, 0) == -1);
|
||||
|
||||
/* restore parent's signal handling */
|
||||
signal(SIGHUP, oldsighup);
|
||||
|
@ -1068,9 +1069,10 @@ static void spawn(char *file, char *arg1, char *arg2, const char *dir, uchar fla
|
|||
|
||||
if (flag & F_MULTI) {
|
||||
size_t len = strlen(file) + 1;
|
||||
|
||||
cmd = (char *)malloc(len);
|
||||
if (!cmd) {
|
||||
DPRINTF_S("spawn: malloc()!");
|
||||
DPRINTF_S("malloc()!");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -1078,7 +1080,7 @@ static void spawn(char *file, char *arg1, char *arg2, const char *dir, uchar fla
|
|||
status = parseargs(cmd, argv);
|
||||
if (status == -1 || status > (EXEC_ARGS_MAX - 3)) { /* arg1, arg2 and last NULL */
|
||||
free(cmd);
|
||||
DPRINTF_S("spawn: NULL or too many args");
|
||||
DPRINTF_S("NULL or too many args");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -3923,7 +3925,8 @@ nochange:
|
|||
fd = cfg.curctx;
|
||||
for (r = (fd + 1) & ~CTX_MAX;
|
||||
(r != fd) && !g_ctx[r].c_cfg.ctxactive;
|
||||
r = ((r + 1) & ~CTX_MAX));
|
||||
r = ((r + 1) & ~CTX_MAX)) {
|
||||
};
|
||||
|
||||
if (r != fd) {
|
||||
g_ctx[fd].c_cfg.ctxactive = 0;
|
||||
|
@ -4154,8 +4157,11 @@ int main(int argc, char *argv[])
|
|||
g_tmpfplen = xstrlcpy(g_tmpfpath, home, HOME_LEN_MAX);
|
||||
else if (xdiraccess("/tmp"))
|
||||
g_tmpfplen = xstrlcpy(g_tmpfpath, "/tmp", HOME_LEN_MAX);
|
||||
else if ((copier = getenv("TMPDIR")) != NULL)
|
||||
else {
|
||||
copier = getenv("TMPDIR");
|
||||
if (copier != NULL)
|
||||
g_tmpfplen = xstrlcpy(g_tmpfpath, copier, HOME_LEN_MAX);
|
||||
}
|
||||
|
||||
if (!cfg.picker && g_tmpfplen) {
|
||||
xstrlcpy(g_cppath, g_tmpfpath, PATH_MAX);
|
||||
|
|
Loading…
Reference in a new issue