From 58bd7ad060b4675c47389844da25f7c25a209704 Mon Sep 17 00:00:00 2001 From: Marcel Huber Date: Wed, 21 May 2014 11:17:23 +0200 Subject: [PATCH] Omit compiler warning by sticking to RAII Resolve gcc 4.9.0 20140507 warnings about uninitialized 'ptr' when using -Wmaybe-uninitialized. The first two cases appears appear to be legitimate but not the second two. In general this is a good practice so they are all initialized. Signed-off-by: Marcel Huber Signed-off-by: Brian Behlendorf Closes #2345 --- lib/libspl/include/umem.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libspl/include/umem.h b/lib/libspl/include/umem.h index 0d0778cfbc..b3ce6e7105 100644 --- a/lib/libspl/include/umem.h +++ b/lib/libspl/include/umem.h @@ -82,7 +82,7 @@ typedef struct umem_cache { static inline void * umem_alloc(size_t size, int flags) { - void *ptr; + void *ptr = NULL; do { ptr = malloc(size); @@ -94,8 +94,8 @@ umem_alloc(size_t size, int flags) static inline void * umem_alloc_aligned(size_t size, size_t align, int flags) { - void *ptr; - int rc; + void *ptr = NULL; + int rc = EINVAL; do { rc = posix_memalign(&ptr, align, size); @@ -117,7 +117,7 @@ umem_alloc_aligned(size_t size, size_t align, int flags) static inline void * umem_zalloc(size_t size, int flags) { - void *ptr; + void *ptr = NULL; ptr = umem_alloc(size, flags); if (ptr) @@ -170,7 +170,7 @@ umem_cache_destroy(umem_cache_t *cp) static inline void * umem_cache_alloc(umem_cache_t *cp, int flags) { - void *ptr; + void *ptr = NULL; if (cp->cache_align != 0) ptr = umem_alloc_aligned(