nisw?blank() should return int, not bool, to match isblank()

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2654 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/src/chars.c b/src/chars.c
index 34712dc75140d1331a7eb9f9a7fd5ea2f66092ae..341280c13908690d426b31e06f1dce00f4c84956 100644 (file)
--- a/src/chars.c
+++ b/src/chars.c
@@ -39,16 +39,9 @@
 #endif
 #endif
 
-/* Return TRUE if the value of c is in byte range, and FALSE
- * otherwise. */
-bool is_byte(int c)
-{
-    return ((unsigned int)c == (unsigned char)c);
-}
-
 #ifndef HAVE_ISBLANK
 /* This function is equivalent to isblank(). */
-bool nisblank(int c)
+int nisblank(int c)
 {
     return isspace(c) && (c == '\t' || !is_cntrl_char(c));
 }
@@ -56,12 +49,19 @@ bool nisblank(int c)
 
 #if defined(NANO_WIDE) && !defined(HAVE_ISWBLANK)
 /* This function is equivalent to iswblank(). */
-bool niswblank(wint_t wc)
+int niswblank(wint_t wc)
 {
     return iswspace(wc) && (wc == '\t' || !is_cntrl_wchar(wc));
 }
 #endif
 
+/* Return TRUE if the value of c is in byte range, and FALSE
+ * otherwise. */
+bool is_byte(int c)
+{
+    return ((unsigned int)c == (unsigned char)c);
+}
+
 /* This function is equivalent to isblank() for multibyte characters. */
 bool is_blank_mbchar(const char *c)
 {

diff --git a/src/proto.h b/src/proto.h
index a5b4c5fd069788b260ae07a52bceaaa232df3005..a41e647f5307a1453d7f45301bc757d1ff8f4ee7 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -159,13 +159,13 @@ extern char *homedir;
 /* Functions we want available. */
 
 /* Public functions in chars.c. */
-bool is_byte(int c);
 #ifndef HAVE_ISBLANK
-bool nisblank(int c);
+int nisblank(int c);
 #endif
 #if defined(NANO_WIDE) && !defined(HAVE_ISWBLANK)
-bool niswblank(wint_t wc);
+int niswblank(wint_t wc);
 #endif
+bool is_byte(int c);
 bool is_blank_mbchar(const char *c);
 bool is_cntrl_char(int c);
 #ifdef NANO_WIDE