diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-20 05:42:11 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:41:06 +0300 |
commit | 7c0e5e8f99f01001b46377c200dbf3850821a0ec (patch) | |
tree | c1013a0fe0d40279f1cf52e79c6cb56e2646a3a2 /talloc.c | |
parent | c0c9b26ff96df8dfe89c4c52c70e2c6b2e30100f (diff) | |
download | mpv-7c0e5e8f99f01001b46377c200dbf3850821a0ec.tar.bz2 mpv-7c0e5e8f99f01001b46377c200dbf3850821a0ec.tar.xz |
Make talloc abort() instead of returning NULL
Replace (hopefully) all cases where normally successful allocations
could return NULL with abort(). This should allow skipping most checks
on allocation return values.
Diffstat (limited to 'talloc.c')
-rw-r--r-- | talloc.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -328,7 +328,7 @@ static inline void *__talloc(const void *context, size_t size) } if (unlikely(size >= MAX_TALLOC_SIZE)) { - return NULL; + abort(); // return NULL; } if (context != NULL) { @@ -338,7 +338,7 @@ static inline void *__talloc(const void *context, size_t size) if (tc == NULL) { tc = (struct talloc_chunk *)malloc(TC_HDR_SIZE+size); - if (unlikely(tc == NULL)) return NULL; + if (unlikely(tc == NULL)) abort(); // return NULL; tc->flags = TALLOC_MAGIC; tc->pool = NULL; } @@ -960,7 +960,7 @@ void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *n } if (unlikely(size >= MAX_TALLOC_SIZE)) { - return NULL; + abort(); // return NULL; } /* realloc(NULL) is equivalent to malloc() */ @@ -972,7 +972,7 @@ void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *n /* don't allow realloc on referenced pointers */ if (unlikely(tc->refs)) { - return NULL; + abort(); // return NULL; } /* don't shrink if we have less than 1k to gain */ @@ -1012,7 +1012,7 @@ void *_talloc_realloc(const void *context, void *ptr, size_t size, const char *n #endif if (unlikely(!new_ptr)) { tc->flags &= ~TALLOC_FLAG_FREE; - return NULL; + abort(); // return NULL; } tc = (struct talloc_chunk *)new_ptr; @@ -1466,7 +1466,7 @@ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) len = vsnprintf(&c, 1, fmt, ap2); va_end(ap2); if (unlikely(len < 0)) { - return NULL; + abort(); // return NULL; } ret = (char *)__talloc(t, len+1); @@ -1604,7 +1604,7 @@ char *talloc_asprintf_append_buffer(char *s, const char *fmt, ...) void *_talloc_array(const void *ctx, size_t el_size, unsigned count, const char *name) { if (count >= MAX_TALLOC_SIZE/el_size) { - return NULL; + abort(); // return NULL; } return _talloc_named_const(ctx, el_size * count, name); } @@ -1615,7 +1615,7 @@ void *_talloc_array(const void *ctx, size_t el_size, unsigned count, const char void *_talloc_zero_array(const void *ctx, size_t el_size, unsigned count, const char *name) { if (count >= MAX_TALLOC_SIZE/el_size) { - return NULL; + abort(); // return NULL; } return _talloc_zero(ctx, el_size * count, name); } @@ -1626,7 +1626,7 @@ void *_talloc_zero_array(const void *ctx, size_t el_size, unsigned count, const void *_talloc_realloc_array(const void *ctx, void *ptr, size_t el_size, unsigned count, const char *name) { if (count >= MAX_TALLOC_SIZE/el_size) { - return NULL; + abort(); // return NULL; } return _talloc_realloc(ctx, ptr, el_size * count, name); } |