From: David Lawrence Ramsey Date: Sun, 12 Jun 2005 18:05:42 +0000 (+0000) Subject: one last cleanup to chars.c X-Git-Tag: v1.3.8~171 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=19462616d4279c3571dbb2be5329592a11b6c0e1;p=nano.git one last cleanup to chars.c git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2632 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 15a28c23..1c4b96ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,9 +58,9 @@ CVS code - wrappers, change other ctype wrappers to take wint_t instead of wchar_t, and rename some functions for consistency. Changes to is_alnum_mbchar(), is_blank_char() (renamed nisblank()), - is_blank_mbchar(), is_blank_wchar() (renamed niswblank()), and - is_cntrl_wchar(), etc.; removal of is_alnum_char() and - is_alnum_wchar(). (DLR) + is_blank_mbchar(), is_blank_wchar() (renamed niswblank()), + is_cntrl_wchar(), control_rep(), control_mbrep(), etc.; + removal of is_alnum_char() and is_alnum_wchar(). (DLR) - chars.c: make_mbstring() - Change erroneous ENABLE_EXTRA #ifdef to NANO_EXTRA to fix a diff --git a/src/chars.c b/src/chars.c index 6a60b45f..880b034f 100644 --- a/src/chars.c +++ b/src/chars.c @@ -148,7 +148,7 @@ bool is_cntrl_mbchar(const char *c) /* c is a control character. It displays as ^@, ^?, or ^[ch], where ch * 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. */ if (c == '\n') @@ -205,7 +205,7 @@ char *control_mbrep(const char *c, char *crep, int *crep_len) } else { #endif *crep_len = 1; - *crep = control_rep((unsigned char)*c); + *crep = control_rep(*c); return crep; #ifdef NANO_WIDE diff --git a/src/proto.h b/src/proto.h index 49d1b24c..6ceeab90 100644 --- a/src/proto.h +++ b/src/proto.h @@ -173,7 +173,7 @@ bool is_cntrl_char(int c); bool is_cntrl_wchar(wint_t wc); #endif bool is_cntrl_mbchar(const char *c); -unsigned char control_rep(unsigned char c); +char control_rep(char c); #ifdef NANO_WIDE wchar_t control_wrep(wchar_t c); #endif