From 26ebd35d54255dbf70f9eab60ffd42668e803df3 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Wed, 30 Nov 2005 19:33:56 +0000 Subject: [PATCH] in ngetdelim(), do sanity checks in an assert instead of checking them manually and returning -1 if they fail git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3232 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ src/utils.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a6f0009..a07272e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -224,6 +224,9 @@ CVS code - the text of the spell-checked file into its own function, replace_buffer(). (DLR) - utils.c: + ngetdelim() + - Do sanity checks in an assert instead of checking them + manually and returning -1 if they fail. (DLR) is_whole_word() - Only include when DISABLE_SPELLER isn't defined, as it's only used then. (DLR) diff --git a/src/utils.c b/src/utils.c index 880e8be3..a7ffc746 100644 --- a/src/utils.c +++ b/src/utils.c @@ -199,8 +199,7 @@ ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream) int c; /* Sanity checks. */ - if (lineptr == NULL || n == NULL || stream == NULL) - return -1; + assert(lineptr != NULL && n != NULL && stream != NULL); /* Allocate the line the first time. */ if (*lineptr == NULL) {