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

tweaks: rename two variables, because this 'rev_start' is irksome 

And one-letter variables I cannot "see" -- they are too small.
master
Benno Schulenberg 2016-06-25 21:36:58 +02:00
parent b06407fbd7
commit 329021e24a
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/chars.c
View File

@ -647,51 +647,50 @@ char *mbstrpbrk(const char *s, const char *accept)
return (char *) strpbrk(s, accept);
}
/* This function is equivalent to strpbrk(), except in that it scans the
* string in reverse, starting at rev_start. */
char *revstrpbrk(const char *s, const char *accept, const char
*rev_start)
/* Locate the first occurrence in the string that starts at head
* of any of the characters in the string accept, starting from
* the given index and searching backwards. */
char *revstrpbrk(const char *head, const char *accept, const char *index)
{
if (*rev_start == '\0') {
if (rev_start == s)
if (*index == '\0') {
if (index == head)
return NULL;
rev_start--;
index--;
}
for (; rev_start >= s; rev_start--) {
if (strchr(accept, *rev_start) != NULL)
return (char *)rev_start;
while (index >= head) {
if (strchr(accept, *index) != NULL)
return (char *)index;
index--;
}
return NULL;
}
/* This function is equivalent to strpbrk() for multibyte strings,
* except in that it scans the string in reverse, starting at rev_start. */
char *mbrevstrpbrk(const char *s, const char *accept, const char
*rev_start)
/* The same as the preceding function but then for multibyte strings. */
char *mbrevstrpbrk(const char *head, const char *accept, const char *index)
{
#ifdef ENABLE_UTF8
if (use_utf8) {
if (*rev_start == '\0') {
if (rev_start == s)
if (*index == '\0') {
if (index == head)
return NULL;
rev_start = s + move_mbleft(s, rev_start - s);
index = head + move_mbleft(head, index - head);
}
while (TRUE) {
if (mbstrchr(accept, rev_start) != NULL)
return (char *)rev_start;
if (mbstrchr(accept, index) != NULL)
return (char *)index;
/* If we've reached the head of the string, we found nothing. */
if (rev_start == s)
if (index == head)
return NULL;
rev_start = s + move_mbleft(s, rev_start - s);
index = head + move_mbleft(head, index - head);
}
} else
#endif
return revstrpbrk(s, accept, rev_start);
return revstrpbrk(head, accept, index);
}
#endif /* !NANO_TINY */

6
src/proto.h
View File

@ -216,10 +216,8 @@ char *mbstrchr(const char *s, const char *c);
#endif
#ifndef NANO_TINY
char *mbstrpbrk(const char *s, const char *accept);
char *revstrpbrk(const char *s, const char *accept, const char
*rev_start);
char *mbrevstrpbrk(const char *s, const char *accept, const char
*rev_start);
char *revstrpbrk(const char *head, const char *accept, const char *index);
char *mbrevstrpbrk(const char *head, const char *accept, const char *index);
#endif
#if !defined(DISABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
bool has_blank_mbchars(const char *s);