[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nano-devel] [PATCH 06/10] drop isblank/iswblank fallback functions
From: |
Mike Frysinger |
Subject: |
[Nano-devel] [PATCH 06/10] drop isblank/iswblank fallback functions |
Date: |
Mon, 20 Feb 2017 13:42:12 -0500 |
Switch over to gnulib for these.
---
autogen.sh | 2 ++
configure.ac | 4 ++--
src/chars.c | 16 ----------------
src/nano.h | 10 ----------
src/proto.h | 6 ------
5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 45c5bacdc180..c32b9b998ae6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,6 +7,8 @@ gnulib_hash="730c5249cc17a4ebb7afcb3f2f4e73664eeff5ce"
modules="
getdelim
getline
+ isblank
+ iswblank
strcase
strcasestr-simple
strnlen
diff --git a/configure.ac b/configure.ac
index 9247ec62121a..6274b67c89f8 100644
--- 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
index add7a391854b..3f80e31e7bcf 100644
--- 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
index 6c2a78323ca8..e7c09f25dc74 100644
--- 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
index 5ea91c479a2e..9adc22a3fc51 100644
--- 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);
--
2.11.1
- [Nano-devel] [PATCH 00/10 v2] update autotools & add gnulib support, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 01/10] configure: require autoconf-2.69/automake-1.14, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 03/10] add support for gnulib, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 06/10] drop isblank/iswblank fallback functions,
Mike Frysinger <=
- [Nano-devel] [PATCH 05/10] drop getdelim/getline fallback functions, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 04/10] drop various str fallback functions, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 10/10] drop wchar.h/wctype.h/stdarg.h checks, Mike Frysinger, 2017/02/20
- [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/20
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Benno Schulenberg, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Benno Schulenberg, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/21
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Mike Frysinger, 2017/02/22
- Re: [Nano-devel] [PATCH 07/10] assume regex.h support is always available, Benno Schulenberg, 2017/02/23