nano

commit 63cae0c199e5ee95e470452950402c328e5b01b0
parent e9a3f858bc0823149901e48a4ce3bf7babe1eb47
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Tue, 21 Feb 2017 17:04:38 -0500

drop the isblank/iswblank fallback functions

Switch over to gnulib for these.

Diffstat:
M
autogen.sh
 | 
2
++
M
configure.ac
 | 
4
++--
M
src/chars.c
 | 
16
----------------
M
src/nano.h
 | 
10
----------
M
src/proto.h
 | 
6
------

5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/autogen.sh b/autogen.sh
@@ -7,6 +7,8 @@ gnulib_hash="4084b3a1094372b960ce4a97634e08f4538c8bdd"
 modules="
 	getdelim
 	getline
+	isblank
+	iswblank
 	strcase
 	strcasestr-simple
 	strnlen
diff --git a/configure.ac b/configure.ac
@@ -473,10 +473,10 @@ int main(void)
 
 dnl Checks for functions.
 
-AC_CHECK_FUNCS(isblank snprintf vsnprintf)
+AC_CHECK_FUNCS(snprintf vsnprintf)
 
 if test "x$enable_utf8" != xno; then
-    AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth)
+    AC_CHECK_FUNCS(iswalnum iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth)
 fi
 
 if test x$ac_cv_func_snprintf = xno; then
diff --git a/src/chars.c b/src/chars.c
@@ -61,22 +61,6 @@ char *addstrings(char* str1, size_t len1, char* str2, size_t len2)
     return str1;
 }
 
-#ifndef HAVE_ISBLANK
-/* This function is equivalent to isblank(). */
-bool nisblank(int c)
-{
-    return isspace(c) && (c == '\t' || !is_cntrl_char(c));
-}
-#endif
-
-#if !defined(HAVE_ISWBLANK) && defined(ENABLE_UTF8)
-/* This function is equivalent to iswblank(). */
-bool niswblank(wchar_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)
 {
diff --git a/src/nano.h b/src/nano.h
@@ -128,16 +128,6 @@
 #define vsnprintf g_vsnprintf
 #endif
 
-/* If no isblank(), iswblank(), strcasecmp(), strncasecmp(),
- * strcasestr(), strnlen(), getdelim(), or getline(), use the versions
- * we have. */
-#ifndef HAVE_ISBLANK
-#define isblank nisblank
-#endif
-#ifndef HAVE_ISWBLANK
-#define iswblank niswblank
-#endif
-
 /* If we aren't using ncurses with mouse support, turn the mouse support
  * off, as it's useless then. */
 #ifndef NCURSES_MOUSE_VERSION
diff --git a/src/proto.h b/src/proto.h
@@ -193,12 +193,6 @@ void utf8_init(void);
 bool using_utf8(void);
 #endif
 char *addstrings(char* str1, size_t len1, char* str2, size_t len2);
-#ifndef HAVE_ISBLANK
-bool nisblank(int c);
-#endif
-#if !defined(HAVE_ISWBLANK) && defined(ENABLE_UTF8)
-bool niswblank(wchar_t wc);
-#endif
 bool is_byte(int c);
 bool is_alpha_mbchar(const char *c);
 bool is_alnum_mbchar(const char *c);