From: Yann Collet <yann.collet.73@gmail.com>
Date: Fri, 20 May 2016 10:34:40 +0000 (+0200)
Subject: all programs use `ZSTD_VERSION_STRING` from `zstd.h` to display their version
X-Git-Tag: v0.7.0^2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45f84ab7ccbe4dc0ae7308a1b375fd3becfc5fe4;p=thirdparty%2Fzstd.git

all programs use `ZSTD_VERSION_STRING` from `zstd.h` to display their version
---

diff --git a/lib/compress/fse_compress.c b/lib/compress/fse_compress.c
index dad0be794..cde30acff 100644
--- a/lib/compress/fse_compress.c
+++ b/lib/compress/fse_compress.c
@@ -111,8 +111,6 @@ size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned
     U32 highThreshold = tableSize-1;
 
     /* CTable header */
-
-
     tableU16[-2] = (U16) tableLog;
     tableU16[-1] = (U16) maxSymbolValue;
 
@@ -147,10 +145,10 @@ size_t FSE_buildCTable(FSE_CTable* ct, const short* normalizedCounter, unsigned
     }
 
     /* Build table */
-    { U32 u; for (u=0; u<tableSize; u++) {
+    {   U32 u; for (u=0; u<tableSize; u++) {
         FSE_FUNCTION_TYPE s = tableSymbol[u];   /* note : static analyzer may not understand tableSymbol is properly initialized */
         tableU16[cumul[s]++] = (U16) (tableSize+u);   /* TableU16 : sorted by symbol order; gives next state value */
-    }}
+    }   }
 
     /* Build Symbol Transformation Table */
     {   unsigned total = 0;
diff --git a/programs/fullbench.c b/programs/fullbench.c
index 6f5d6a782..06796c25a 100644
--- a/programs/fullbench.c
+++ b/programs/fullbench.c
@@ -32,7 +32,7 @@
 #include <time.h>        /* clock_t, clock, CLOCKS_PER_SEC */
 
 #include "mem.h"
-#include "zstd_static.h"
+#include "zstd_static.h" /* ZSTD_VERSION_STRING */
 #include "fse_static.h"
 #include "zbuff.h"
 #include "datagen.h"
@@ -42,11 +42,8 @@
 *  Constants
 **************************************/
 #define PROGRAM_DESCRIPTION "Zstandard speed analyzer"
-#ifndef ZSTD_VERSION
-#  define ZSTD_VERSION ""
-#endif
 #define AUTHOR "Yann Collet"
-#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, ZSTD_VERSION, (int)(sizeof(void*)*8), AUTHOR, __DATE__
+#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, ZSTD_VERSION_STRING, (int)(sizeof(void*)*8), AUTHOR, __DATE__
 
 
 #define KB *(1<<10)
diff --git a/programs/fuzzer.c b/programs/fuzzer.c
index 5bf532e1a..e664bf433 100644
--- a/programs/fuzzer.c
+++ b/programs/fuzzer.c
@@ -40,7 +40,7 @@
 #include <sys/timeb.h>   /* timeb */
 #include <string.h>      /* strcmp */
 #include <time.h>        /* clock_t */
-#include "zstd_static.h"
+#include "zstd_static.h" /* ZSTD_VERSION_STRING */
 #include "datagen.h"     /* RDG_genBuffer */
 #include "xxhash.h"      /* XXH64 */
 #include "mem.h"
@@ -49,10 +49,6 @@
 /*-************************************
 *  Constants
 **************************************/
-#ifndef ZSTD_VERSION
-#  define ZSTD_VERSION ""
-#endif
-
 #define KB *(1U<<10)
 #define MB *(1U<<20)
 #define GB *(1U<<30)
@@ -805,7 +801,7 @@ int main(int argc, const char** argv)
     }   }   }   }   /* for (argNb=1; argNb<argc; argNb++) */
 
     /* Get Seed */
-    DISPLAY("Starting zstd tester (%i-bits, %s)\n", (int)(sizeof(size_t)*8), ZSTD_VERSION);
+    DISPLAY("Starting zstd tester (%i-bits, %s)\n", (int)(sizeof(size_t)*8), ZSTD_VERSION_STRING);
 
     if (!seedset) seed = (U32)(clock() % 10000);
     DISPLAY("Seed = %u\n", seed);
diff --git a/programs/paramgrill.c b/programs/paramgrill.c
index 0a0824adc..6dc90b219 100644
--- a/programs/paramgrill.c
+++ b/programs/paramgrill.c
@@ -57,11 +57,8 @@
 *  Constants
 **************************************/
 #define PROGRAM_DESCRIPTION "ZSTD parameters tester"
-#ifndef ZSTD_VERSION
-#  define ZSTD_VERSION ""
-#endif
 #define AUTHOR "Yann Collet"
-#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, ZSTD_VERSION, (int)(sizeof(void*)*8), AUTHOR, __DATE__
+#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", PROGRAM_DESCRIPTION, ZSTD_VERSION_STRING, (int)(sizeof(void*)*8), AUTHOR, __DATE__
 
 
 #define KB *(1<<10)
diff --git a/programs/zbufftest.c b/programs/zbufftest.c
index eb63117ab..c350fabb9 100644
--- a/programs/zbufftest.c
+++ b/programs/zbufftest.c
@@ -49,10 +49,6 @@
 /*-************************************
 *  Constants
 **************************************/
-#ifndef ZSTD_VERSION
-#  define ZSTD_VERSION ""
-#endif
-
 #define KB *(1U<<10)
 #define MB *(1U<<20)
 #define GB *(1U<<30)
@@ -577,7 +573,7 @@ int main(int argc, const char** argv)
     }   }   }   /* for(argNb=1; argNb<argc; argNb++) */
 
     /* Get Seed */
-    DISPLAY("Starting zstd_buffered tester (%i-bits, %s)\n", (int)(sizeof(size_t)*8), ZSTD_VERSION);
+    DISPLAY("Starting zstd_buffered tester (%i-bits, %s)\n", (int)(sizeof(size_t)*8), ZSTD_VERSION_STRING);
 
     if (!seedset) seed = FUZ_GetMilliStart() % 10000;
     DISPLAY("Seed = %u\n", seed);