Commit 356d2482 authored by David Lawrence Ramsey's avatar David Lawrence Ramsey
Browse files

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
No related merge requests found
Showing with 12 additions and 12 deletions
+12 -12
......@@ -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)
{
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment