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

add asserts, plus a few more cosmetic fixes 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2257 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-01-14 03:22:54 +00:00
parent 78dadd4550
commit 116c828c50
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -167,6 +167,8 @@ CVS code -
is_blank_char() is_blank_char()
- Rewrite to use ctype functions instead of checking directly - Rewrite to use ctype functions instead of checking directly
for spaces and tabs. (DLR) for spaces and tabs. (DLR)
revstrstr(), revstristr()
- Add asserts. (DLR)
- winio.c: - winio.c:
titlebar() titlebar()
- Rename some variables for consistency, make space an int - Rename some variables for consistency, make space an int

11
src/utils.c
View File

@ -209,8 +209,7 @@ const char *nstristr(const char *haystack, const char *needle)
assert(haystack != NULL && needle != NULL); assert(haystack != NULL && needle != NULL);
for (; *haystack != '\0'; haystack++) { for (; *haystack != '\0'; haystack++) {
const char *p = haystack; const char *p = haystack, *q = needle;
const char *q = needle;
for (; tolower(*p) == tolower(*q) && *q != '\0'; p++, q++) for (; tolower(*p) == tolower(*q) && *q != '\0'; p++, q++)
; ;
@ -228,28 +227,36 @@ const char *nstristr(const char *haystack, const char *needle)
const char *revstrstr(const char *haystack, const char *needle, const const char *revstrstr(const char *haystack, const char *needle, const
char *rev_start) char *rev_start)
{ {
assert(haystack != NULL && needle != NULL && rev_start != NULL);
for (; rev_start >= haystack; rev_start--) { for (; rev_start >= haystack; rev_start--) {
const char *r, *q; const char *r, *q;
for (r = rev_start, q = needle; *q == *r && *q != '\0'; r++, q++) for (r = rev_start, q = needle; *q == *r && *q != '\0'; r++, q++)
; ;
if (*q == '\0') if (*q == '\0')
return rev_start; return rev_start;
} }
return NULL; return NULL;
} }
const char *revstristr(const char *haystack, const char *needle, const const char *revstristr(const char *haystack, const char *needle, const
char *rev_start) char *rev_start)
{ {
assert(haystack != NULL && needle != NULL && rev_start != NULL);
for (; rev_start >= haystack; rev_start--) { for (; rev_start >= haystack; rev_start--) {
const char *r = rev_start, *q = needle; const char *r = rev_start, *q = needle;
for (; tolower(*q) == tolower(*r) && *q != '\0'; r++, q++) for (; tolower(*q) == tolower(*r) && *q != '\0'; r++, q++)
; ;
if (*q == '\0') if (*q == '\0')
return rev_start; return rev_start;
} }
return NULL; return NULL;
} }
#endif /* !NANO_SMALL */ #endif /* !NANO_SMALL */