[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nano-devel] [PATCH 4/8] drop isblank/iswblank fallback functions
From: |
Mike Frysinger |
Subject: |
[Nano-devel] [PATCH 4/8] drop isblank/iswblank fallback functions |
Date: |
Sat, 6 Feb 2016 19:03:57 -0500 |
Switch over to gnulib for these.
---
autogen.sh | 2 ++
configure.ac | 4 ++--
src/chars.c | 17 -----------------
src/nano.h | 10 ----------
src/proto.h | 6 ------
5 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index ec29cf3..4a42cd1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,8 @@
modules="
getdelim
getline
+ isblank
+ iswblank
strcase
strcasestr-simple
strnlen
diff --git a/configure.ac b/configure.ac
index fa57e35..915e0b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,10 +434,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 1f72ac4..833e8ce 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -67,23 +67,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 9d68910..d6ea261 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -125,16 +125,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 f9148db..553aec6 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -170,12 +170,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_alnum_mbchar(const char *c);
bool is_blank_mbchar(const char *c);
--
2.6.2
- [Nano-devel] [PATCH 1/8] add support for gnulib, Mike Frysinger, 2016/02/06
- [Nano-devel] [PATCH 8/8] drop wchar.h/wctype.h/stdarg.h checks, Mike Frysinger, 2016/02/06
- [Nano-devel] [PATCH 6/8] assume getopt_long support is always available, Mike Frysinger, 2016/02/06
- [Nano-devel] [PATCH 3/8] drop getdelim/getline fallback functions, Mike Frysinger, 2016/02/06
- [Nano-devel] [PATCH 4/8] drop isblank/iswblank fallback functions,
Mike Frysinger <=
- [Nano-devel] [PATCH 5/8] assume regex.h support is always available, Mike Frysinger, 2016/02/06
- [Nano-devel] [PATCH 2/8] drop various str fallback functions, Mike Frysinger, 2016/02/06
- [Nano-devel] [PATCH 7/8] drop glib fallback for snprintf/vsnprintf, Mike Frysinger, 2016/02/06
- Re: [Nano-devel] [PATCH 1/8] add support for gnulib, Mike Frysinger, 2016/02/06
Re: [Nano-devel] [PATCH 1/8] add support for gnulib, Benno Schulenberg, 2016/02/07