From c1f8bf12fd1540a7b69150780215dab4b0784896 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Fri, 16 Jan 2015 13:57:15 +0200 Subject: [PATCH] pg_realloc(NULL, ...) is equivalent to pg_malloc(...). No need to check. --- src/bin/pg_rewind/datapagemap.c | 5 +---- src/bin/pg_rewind/filemap.c | 8 +++----- src/bin/pg_rewind/timeline.c | 5 +---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c index f89a3545a3..50b8540254 100644 --- a/src/bin/pg_rewind/datapagemap.c +++ b/src/bin/pg_rewind/datapagemap.c @@ -51,10 +51,7 @@ datapagemap_add(datapagemap_t *map, BlockNumber blkno) newsize = offset + 1; newsize += 10; - if (map->bitmap == NULL) - map->bitmap = pg_malloc(newsize); - else - map->bitmap = pg_realloc(map->bitmap, newsize); + map->bitmap = pg_realloc(map->bitmap, newsize); /* zero out the newly allocated region */ memset(&map->bitmap[oldsize], 0, newsize - oldsize); diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c index c3e669d1d7..970bd6eb77 100644 --- a/src/bin/pg_rewind/filemap.c +++ b/src/bin/pg_rewind/filemap.c @@ -403,11 +403,9 @@ filemap_list_to_array(void) file_entry_t *entry, *next; - if (filemap->array == NULL) - filemap->array = pg_malloc(filemap->nlist * sizeof(file_entry_t)); - else - filemap->array = pg_realloc(filemap->array, - (filemap->nlist + filemap->narray) * sizeof(file_entry_t)); + filemap->array = + pg_realloc(filemap->array, + (filemap->nlist + filemap->narray) * sizeof(file_entry_t)); narray = filemap->narray; for (entry = filemap->first; entry != NULL; entry = next) diff --git a/src/bin/pg_rewind/timeline.c b/src/bin/pg_rewind/timeline.c index e9ea3706a9..41f3815579 100644 --- a/src/bin/pg_rewind/timeline.c +++ b/src/bin/pg_rewind/timeline.c @@ -90,10 +90,7 @@ rewind_parseTimeLineHistory(char *buffer, TimeLineID targetTLI, int *nentries) lasttli = tli; nlines++; - if (entries) - entries = pg_realloc(entries, nlines * sizeof(TimeLineHistoryEntry)); - else - entries = pg_malloc(1 * sizeof(TimeLineHistoryEntry)); + entries = pg_realloc(entries, nlines * sizeof(TimeLineHistoryEntry)); entry = &entries[nlines - 1]; entry->tli = tli; -- 2.39.5