pg_realloc(NULL, ...) is equivalent to pg_malloc(...). No need to check.

diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
index f89a3545a369402c226afb4ea5aa75ba88ac24d1..50b8540254bf7e48ca46f0e68d9f3861f3c07f01 100644 (file)
--- 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 c3e669d1d7884c1dd6c3293ea839ab8ce067efd1..970bd6eb776810fea8b9fce73a26d0af811386c2 100644 (file)
--- 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 e9ea3706a908221d8b24233f69b7de3e10d63550..41f38155794b3d1bd65610069f12bc46d3271db6 100644 (file)
--- 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;