mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +03:00
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 <marcelhuberfoo@gmail.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #2345
This commit is contained in:
parent
5f3c101b8f
commit
58bd7ad060
@ -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(
|
||||
|
Loading…
Reference in New Issue
Block a user