nnn

commit 121bbe566b304309520bc8ed161630e68813ed8e
parent 23f84df1d8722591ea93aa1dd84f313cebbf3548
Author: Sijmen J. Mulder <ik@sjmulder.nl>
Date:   Thu, 13 Jun 2019 00:51:19 +0200

Fix sign conversion and comparison warnings

Building on i386 (NetBSD or Debian):

  src/nnn.c: In function 'selectiontofd':
  src/nnn.c:783:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
    while (pos <= lastpos) {
               ^
  src/nnn.c:791:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (pos <= lastpos) {
             ^
  src/nnn.c: In function 'showcplist':
  src/nnn.c:823:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
    if (pos && pos == copybufpos)
                   ^
  src/nnn.c: In function 'xlink':
  src/nnn.c:1955:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
    while (pos < copybufpos) {

Diffstat:
M
src/nnn.c
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/nnn.c b/src/nnn.c
@@ -766,11 +766,12 @@ static void appendfpath(const char *path, const size_t len)
 }
 
 /* Write selected file paths to fd, linefeed separated */
-static ssize_t selectiontofd(int fd, uint *pcount)
+static size_t selectiontofd(int fd, uint *pcount)
 {
 	uint lastpos, count = 0;
 	char *pbuf = pcopybuf;
-	ssize_t pos = 0, len, r;
+	size_t pos = 0, len;
+	ssize_t r;
 
 	if (pcount)
 		*pcount = 0;
@@ -785,7 +786,7 @@ static ssize_t selectiontofd(int fd, uint *pcount)
 		pos += len;
 
 		r = write(fd, pbuf, len);
-		if (r != len)
+		if (r != (ssize_t)len)
 			return pos;
 
 		if (pos <= lastpos) {
@@ -806,7 +807,7 @@ static ssize_t selectiontofd(int fd, uint *pcount)
 static void showcplist(void)
 {
 	int fd;
-	ssize_t pos;
+	size_t pos;
 
 	if (!copybufpos)
 		return;
@@ -1938,7 +1939,7 @@ static int xlink(char *suffix, char *path, char *buf, int *presel, int type)
 {
 	int count = 0;
 	char *pbuf = pcopybuf, *fname;
-	ssize_t pos = 0, len, r;
+	size_t pos = 0, len, r;
 	int (*link_fn)(const char *, const char *) = NULL;
 
 	/* Check if selection is empty */