diff options
Diffstat (limited to 'ffs/src')
| -rw-r--r-- | ffs/src/libffs.c | 9 | ||||
| -rw-r--r-- | ffs/src/libffs2.c | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ffs/src/libffs.c b/ffs/src/libffs.c index 55e33bf..7e20bef 100644 --- a/ffs/src/libffs.c +++ b/ffs/src/libffs.c @@ -48,7 +48,6 @@ #include "libffs.h" -#include <clib/assert.h> #include <clib/builtin.h> #include <clib/checksum.h> #include <clib/misc.h> @@ -268,7 +267,7 @@ static int __entries_read(ffs_hdr_t * hdr, FILE * file, off_t offset) #if 0 static void __entries_write(ffs_hdr_t * hdr, FILE * file, off_t offset) { - if (unlikely(hdr == NULL)) + if (hdr == NULL) ffs_throw(UNEX, 10400, "NULL hdr pointer"); if (hdr->magic != FFS_MAGIC) ffs_throw(UNEX, 10401, "magic number mismatch '%x' != " @@ -740,7 +739,7 @@ int __ffs_fclose(ffs_t * self) int __ffs_close(ffs_t * self) { - if (unlikely(self == NULL)) + if (self == NULL) return 0; if (self->dirty == true) @@ -1353,7 +1352,7 @@ ssize_t __ffs_entry_copy(ffs_t *self, ffs_t *in, const char *path) assert(in != NULL); assert(path != NULL); - if (unlikely(*path == '\0')) + if (*path == '\0') return 0; ffs_entry_t *src = __find_entry(in->hdr, path); @@ -1433,7 +1432,7 @@ ssize_t __ffs_entry_compare(ffs_t * self, ffs_t * in, const char *path) assert(in != NULL); assert(path != NULL); - if (unlikely(*path == '\0')) + if (*path == '\0') return 0; ffs_entry_t *src = __find_entry(in->hdr, path); diff --git a/ffs/src/libffs2.c b/ffs/src/libffs2.c index 741dfa5..f6c8531 100644 --- a/ffs/src/libffs2.c +++ b/ffs/src/libffs2.c @@ -46,7 +46,6 @@ #include "libffs2.h" -#include <clib/assert.h> #include <clib/builtin.h> #include <clib/checksum.h> #include <clib/misc.h> |
