remove unnecessary variables from and add missing asserts to

control_mbrep()

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2737 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index a5c12262689ba4fec0611fd021b91e1b44565f18..f6fbe1ef61f601c90b23b6a72f50963f9e1ea297 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,20 +56,21 @@ CVS code -
          shortcut_init(), usage(), main(), search_init(), nano.1,
          nano.texi, etc. (DLR)
        - Various cleanups and improvements in chars.c.  Remove some
-         unnecessary w?ctype wrappers; change the wctype wrappers to
-         take wint_t instead of wchar_t to match the functions they
-         wrap; rename some functions for consistency; add functions to
-         detect blank characters in a string, for use in rcfile option
-         parsing; and don't count matches between valid and invalid
-         multibyte sequences anymore, as it causes problems when doing
-         a replace.  New functions is_valid_mbstring(),
-         has_blank_chars(), and has_blank_mbchars(); changes to
-         is_alnum_mbchar(), is_blank_char() (renamed nisblank()),
-         is_blank_mbchar(), is_blank_wchar() (renamed niswblank()),
-         is_cntrl_wchar(), control_rep(), control_mbrep(),
-         make_mbstring() (renamed make_valid_mbstring()),
-         mbstrncasecmp(), mbstrcasestr(), mbrevstrcasestr(), etc.;
-         removal of is_alnum_char() and is_alnum_wchar(). (DLR)
+         unnecessary w?ctype wrappers and variables; change the wctype
+         wrappers to take wint_t instead of wchar_t to match the
+         functions they wrap; rename some functions for consistency;
+         add functions to detect blank characters in a string, for use
+         in rcfile option parsing; and don't count matches between
+         valid and invalid multibyte sequences anymore, as it causes
+         problems when doing a replace.  New functions
+         is_valid_mbstring(), has_blank_chars(), and
+         has_blank_mbchars(); changes to is_alnum_mbchar(),
+         is_blank_char() (renamed nisblank()), is_blank_mbchar(),
+         is_blank_wchar() (renamed niswblank()), is_cntrl_wchar(),
+         control_rep(), control_mbrep(), make_mbstring() (renamed
+         make_valid_mbstring()), mbstrncasecmp(), mbstrcasestr(),
+         mbrevstrcasestr(), etc.; removal of is_alnum_char() and
+         is_alnum_wchar(). (DLR)
        - Implement word count via Meta-D at the main window.  Note that
          this is disabled when NANO_SMALL is defined.  New functions
          do_word_count() and do_next_word_void(); changes to

diff --git a/src/chars.c b/src/chars.c
index c9b0356c5d18af2871ad492fb3cab318c1233245..cb0d7266de3c937c742216891b77be380de2581c 100644 (file)
--- a/src/chars.c
+++ b/src/chars.c
@@ -209,26 +209,23 @@ wchar_t control_wrep(wchar_t wc)
  * where ch is c + 64.  We return that multibyte character. */
 char *control_mbrep(const char *c, char *crep, int *crep_len)
 {
-    assert(c != NULL);
+    assert(c != NULL && crep != NULL && crep_len != NULL);
 
 #ifdef NANO_WIDE
     if (ISSET(USE_UTF8)) {
        wchar_t wc;
-       int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX), crep_mb_len;
 
-       if (c_mb_len <= 0) {
+       if (mbtowc(&wc, c, MB_CUR_MAX) <= 0) {
            mbtowc(NULL, NULL, 0);
            wc = (unsigned char)*c;
        }
 
-       crep_mb_len = wctomb(crep, control_wrep(wc));
+       *crep_len = wctomb(crep, control_wrep(wc));
 
-       if (crep_mb_len <= 0) {
+       if (*crep_mb_len <= 0) {
            wctomb(NULL, 0);
-           crep_mb_len = 0;
+           *crep_mb_len = 0;
        }
-
-       *crep_len = crep_mb_len;
     } else {
 #endif
        *crep_len = 1;