Use sizeof(PageHeaderData) in place of pageHeaderSize
authorChristoph Berg <myon@debian.org>
Sun, 2 Sep 2018 11:34:54 +0000 (13:34 +0200)
committerChristoph Berg <myon@debian.org>
Sun, 2 Sep 2018 11:34:54 +0000 (13:34 +0200)
With -Werror=vla, gcc complains about the localCache declaration.
Instead of the pageHeaderSize variable, use sizeof(PageHeaderData)
directly like elsewhere in this file.

pg_filedump.c:648:2: error: ISO C90 forbids array β€˜localCache’ whose
size can’t be evaluated [-Werror=vla]

pg_filedump.c

index fc6ce4b8c42be43d33435d67bd1341da98e0a4f8..a5b75f3ab515313c6ecf6552ab42361fcb874329 100644 (file)
@@ -642,16 +642,15 @@ GetOptionValue(char *optionString)
 unsigned int
 GetBlockSize(FILE *fp)
 {
-       unsigned int pageHeaderSize = sizeof(PageHeaderData);
        unsigned int localSize = 0;
        int                     bytesRead = 0;
-       char            localCache[pageHeaderSize];
+       char            localCache[sizeof(PageHeaderData)];
 
        /* Read the first header off of block 0 to determine the block size */
-       bytesRead = fread(&localCache, 1, pageHeaderSize, fp);
+       bytesRead = fread(&localCache, 1, sizeof(PageHeaderData), fp);
        rewind(fp);
 
-       if (bytesRead == pageHeaderSize)
+       if (bytesRead == sizeof(PageHeaderData))
                localSize = (unsigned int) PageGetPageSize(&localCache);
        else
        {