mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-01-26 18:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1275 from N-R-K/pedantic_cleanups

Browse source 
Pedantic cleanups
This commit is contained in:
Arun 2021-12-25 22:36:13 +05:30 committed by GitHub
parent e44f8d3fcc 02d6feb9b9
commit 3368a7905b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nnn.c
View file

@ -1322,7 +1322,7 @@ static void msg(const char *message)
} }
#ifdef KEY_RESIZE #ifdef KEY_RESIZE
static void handle_key_resize() static void handle_key_resize(void)
{ {
endwin(); endwin();
refresh(); refresh();
@ -3803,7 +3803,7 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar_t max, uchar_t id)
if (!kvarr) if (!kvarr)
return NULL; return NULL;
for (int r = 0; kvarr[r].key && r < max; ++r) { for (int r = 0; r < max && kvarr[r].key; ++r) {
if (kvarr[r].key == key) { if (kvarr[r].key == key) {
/* Do not allocate new memory for plugin */ /* Do not allocate new memory for plugin */
if (id == NNN_PLUG) if (id == NNN_PLUG)
@ -3827,7 +3827,7 @@ static int get_kv_key(kv *kvarr, char *val, uchar_t max, uchar_t id)
if (id != NNN_ORDER) /* For now this function supports only order string */ if (id != NNN_ORDER) /* For now this function supports only order string */
return -1; return -1;
for (int r = 0; kvarr[r].key && r < max; ++r) { for (int r = 0; r < max && kvarr[r].key; ++r) {
if (xstrcmp((orderstr + kvarr[r].off), val) == 0) if (xstrcmp((orderstr + kvarr[r].off), val) == 0)
return kvarr[r].key; return kvarr[r].key;
} }
@ -7971,9 +7971,9 @@ static char *load_input(int fd, const char *path)
++chunk_count; ++chunk_count;
while (off < total_read) { while (off < total_read) {
next = memchr(input + off, '\0', total_read - off) + 1; if ((next = memchr(input + off, '\0', total_read - off)) == NULL)
if (next == (void *)1)
break; break;
++next;
if (next - input == off + 1) { if (next - input == off + 1) {
off = next - input; off = next - input;