one last cleanup to chars.c
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2632 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Этот коммит содержится в:
родитель
d8640480c3
Коммит
19462616d4
@ -58,9 +58,9 @@ CVS code -
|
|||||||
wrappers, change other ctype wrappers to take wint_t instead
|
wrappers, change other ctype wrappers to take wint_t instead
|
||||||
of wchar_t, and rename some functions for consistency. Changes
|
of wchar_t, and rename some functions for consistency. Changes
|
||||||
to is_alnum_mbchar(), is_blank_char() (renamed nisblank()),
|
to is_alnum_mbchar(), is_blank_char() (renamed nisblank()),
|
||||||
is_blank_mbchar(), is_blank_wchar() (renamed niswblank()), and
|
is_blank_mbchar(), is_blank_wchar() (renamed niswblank()),
|
||||||
is_cntrl_wchar(), etc.; removal of is_alnum_char() and
|
is_cntrl_wchar(), control_rep(), control_mbrep(), etc.;
|
||||||
is_alnum_wchar(). (DLR)
|
removal of is_alnum_char() and is_alnum_wchar(). (DLR)
|
||||||
- chars.c:
|
- chars.c:
|
||||||
make_mbstring()
|
make_mbstring()
|
||||||
- Change erroneous ENABLE_EXTRA #ifdef to NANO_EXTRA to fix a
|
- Change erroneous ENABLE_EXTRA #ifdef to NANO_EXTRA to fix a
|
||||||
|
@ -148,7 +148,7 @@ bool is_cntrl_mbchar(const char *c)
|
|||||||
|
|
||||||
/* c is a control character. It displays as ^@, ^?, or ^[ch], where ch
|
/* c is a control character. It displays as ^@, ^?, or ^[ch], where ch
|
||||||
* is c + 64. We return that character. */
|
* is c + 64. We return that character. */
|
||||||
unsigned char control_rep(unsigned char c)
|
char control_rep(char c)
|
||||||
{
|
{
|
||||||
/* Treat newlines embedded in a line as encoded nulls. */
|
/* Treat newlines embedded in a line as encoded nulls. */
|
||||||
if (c == '\n')
|
if (c == '\n')
|
||||||
@ -205,7 +205,7 @@ char *control_mbrep(const char *c, char *crep, int *crep_len)
|
|||||||
} else {
|
} else {
|
||||||
#endif
|
#endif
|
||||||
*crep_len = 1;
|
*crep_len = 1;
|
||||||
*crep = control_rep((unsigned char)*c);
|
*crep = control_rep(*c);
|
||||||
|
|
||||||
return crep;
|
return crep;
|
||||||
#ifdef NANO_WIDE
|
#ifdef NANO_WIDE
|
||||||
|
@ -173,7 +173,7 @@ bool is_cntrl_char(int c);
|
|||||||
bool is_cntrl_wchar(wint_t wc);
|
bool is_cntrl_wchar(wint_t wc);
|
||||||
#endif
|
#endif
|
||||||
bool is_cntrl_mbchar(const char *c);
|
bool is_cntrl_mbchar(const char *c);
|
||||||
unsigned char control_rep(unsigned char c);
|
char control_rep(char c);
|
||||||
#ifdef NANO_WIDE
|
#ifdef NANO_WIDE
|
||||||
wchar_t control_wrep(wchar_t c);
|
wchar_t control_wrep(wchar_t c);
|
||||||
#endif
|
#endif
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user