ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename a function, to be simpler and more accurate

master
Benno Schulenberg 2019-03-21 17:42:34 +01:00
parent 2b21d53857
commit 01e6d435fe
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chars.c
View File

@ -638,7 +638,7 @@ char *mbrevstrpbrk(const char *head, const char *accept, const char *pointer)
#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY)) #if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
/* Return TRUE if the given string contains at least one blank character, /* Return TRUE if the given string contains at least one blank character,
* and FALSE otherwise. */ * and FALSE otherwise. */
bool has_blank_mbchars(const char *s) bool has_blank_char(const char *s)
{ {
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
if (use_utf8) { if (use_utf8) {

2
src/proto.h
View File

@ -228,7 +228,7 @@ char *revstrpbrk(const char *head, const char *accept, const char *index);
char *mbrevstrpbrk(const char *head, const char *accept, const char *index); char *mbrevstrpbrk(const char *head, const char *accept, const char *index);
#endif #endif
#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY)) #if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || defined(ENABLE_JUSTIFY))
bool has_blank_mbchars(const char *s); bool has_blank_char(const char *s);
#endif #endif
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
bool is_valid_unicode(wchar_t wc); bool is_valid_unicode(wchar_t wc);

6
src/rcfile.c
View File

@ -1129,7 +1129,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
} }
if (strcasecmp(rcopts[i].name, "matchbrackets") == 0) { if (strcasecmp(rcopts[i].name, "matchbrackets") == 0) {
matchbrackets = option; matchbrackets = option;
if (has_blank_mbchars(matchbrackets)) { if (has_blank_char(matchbrackets)) {
rcfile_error(N_("Non-blank characters required")); rcfile_error(N_("Non-blank characters required"));
free(matchbrackets); free(matchbrackets);
matchbrackets = NULL; matchbrackets = NULL;
@ -1149,13 +1149,13 @@ void parse_rcfile(FILE *rcstream, bool syntax_only)
#endif #endif
#ifdef ENABLE_JUSTIFY #ifdef ENABLE_JUSTIFY
if (strcasecmp(rcopts[i].name, "punct") == 0) { if (strcasecmp(rcopts[i].name, "punct") == 0) {
if (has_blank_mbchars(option)) { if (has_blank_char(option)) {
rcfile_error(N_("Non-blank characters required")); rcfile_error(N_("Non-blank characters required"));
free(option); free(option);
} else } else
punct = option; punct = option;
} else if (strcasecmp(rcopts[i].name, "brackets") == 0) { } else if (strcasecmp(rcopts[i].name, "brackets") == 0) {
if (has_blank_mbchars(option)) { if (has_blank_char(option)) {
rcfile_error(N_("Non-blank characters required")); rcfile_error(N_("Non-blank characters required"));
free(option); free(option);
} else } else