Revert and re-apply badnull patch

Revert previous patch generated by badnull.cocci script, and apply the new one.
The main difference is that assert and assert-like functions are not touched
anymore.




SVN revision: 51650

1 files changed, 1 insertions, 2 deletions

diff --git a/src/str.c b/src/str.c
index 83b4ac3..c3ac4c7 100644
--- a/src/str.c
+++ b/src/str.c
@@ -230,8 +230,7 @@ spif_str_init_from_fp(spif_str_t self, FILE *fp)
     self->s = (spif_charptr_t) MALLOC(self->size);
 
     for (p = self->s; fgets((char *)p, buff_inc, fp); p += buff_inc) {
-        if ((end = (spif_charptr_t)
-             strchr((const char *)p, '\n')) == NULL) {
+        if (!(end = (spif_charptr_t)strchr((const char *)p, '\n'))) {
             self->size += buff_inc;
             self->s = (spif_charptr_t) REALLOC(self->s, self->size);
         } else {