Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
cs24-19fa
git_rec_nano
Commits
63cae0c1
Commit
63cae0c1
authored
8 years ago
by
Mike Frysinger
Committed by
Benno Schulenberg
8 years ago
Browse files
Options
Download
Email Patches
Plain Diff
drop the isblank/iswblank fallback functions
Switch over to gnulib for these.
parent
e9a3f858
master
feature/match-parens
refactor/readbility
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
autogen.sh
+2
-0
autogen.sh
configure.ac
+2
-2
configure.ac
src/chars.c
+0
-16
src/chars.c
src/nano.h
+0
-10
src/nano.h
src/proto.h
+0
-6
src/proto.h
with
4 additions
and
34 deletions
+4
-34
autogen.sh
View file @
63cae0c1
...
...
@@ -7,6 +7,8 @@ gnulib_hash="4084b3a1094372b960ce4a97634e08f4538c8bdd"
modules
=
"
getdelim
getline
isblank
iswblank
strcase
strcasestr-simple
strnlen
...
...
This diff is collapsed.
Click to expand it.
configure.ac
View file @
63cae0c1
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/chars.c
View file @
63cae0c1
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
src/nano.h
View file @
63cae0c1
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/proto.h
View file @
63cae0c1
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help