From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 23 Jan 2011 14:40:19 +0000 (+0100)
Subject: column: data type mismatch compiler warning fixes
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=395801be436760ab0fb16e9221559a64d6c64ba7;p=util-linux

column: data type mismatch compiler warning fixes

Following warnings will longer appear when one will compile with
gcc flags -Wall -Wextra -pedantic

column.c:364:2: warning: comparison of unsigned expression < 0 is always false
column.c:369:2: warning: comparison of unsigned expression < 0 is always false

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/text-utils/column.c b/text-utils/column.c
index 5b52339f..156de705 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -357,7 +357,7 @@ input(fp)
 #ifdef HAVE_WIDECHAR
 static wchar_t *mbs_to_wcs(const char *s)
 {
-	size_t n;
+	ssize_t n;
 	wchar_t *wcs;
 
 	n = mbstowcs((wchar_t *)0, s, 0);
@@ -366,7 +366,8 @@ static wchar_t *mbs_to_wcs(const char *s)
 	wcs = malloc((n + 1) * sizeof(wchar_t));
 	if (!wcs)
 		return NULL;
-	if (mbstowcs(wcs, s, n + 1) < 0)
+	n = mbstowcs(wcs, s, n + 1);
+	if (n < 0)
 		return NULL;
 	return wcs;
 }