svn commit: r1818727 - in /subversion/trunk/subversion: include/private/svn_subr_private.h libsvn_subr/compress_lz4.c libsvn_subr/sysinfo.c

[astieger]

Author: astieger
Date: Tue Dec 19 22:52:23 2017
New Revision: 1818727

URL: http://svn.apache.org/viewvc?rev=1818727&view=rev
Log:
Print LZ4 version in verbose version output

* subversion/libsvn_subr/compress_lz4.c,
  subversion/include/private/svn_subr_private.h
  (svn_lz4__compiled_version, svn_lz4__runtime_version): New
  function print the compiled, runtime version, respectively
* subversion/libsvn_subr/sysinfo.c (svn_sysinfo__linked_libs):
  Add LZ4 information to the list to be printed

Modified:
    subversion/trunk/subversion/include/private/svn_subr_private.h
    subversion/trunk/subversion/libsvn_subr/compress_lz4.c
    subversion/trunk/subversion/libsvn_subr/sysinfo.c

Modified: subversion/trunk/subversion/include/private/svn_subr_private.h
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_subr_private.h?rev=1818727&r1=1818726&r2=1818727&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_subr_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_subr_private.h Tue Dec 19 
22:52:23 2017
@@ -738,6 +738,12 @@ const char *svn_zlib__compiled_version(v
 /* Return the zlib version we run against. */
 const char *svn_zlib__runtime_version(void);
 
+/* Return the lz4 version we compiled against. */
+const char *svn_lz4__compiled_version(void);
+
+/* Return the lz4 version we run against. */
+const char *svn_lz4__runtime_version(void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/trunk/subversion/libsvn_subr/compress_lz4.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/compress_lz4.c?rev=1818727&r1=1818726&r2=1818727&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/compress_lz4.c (original)
+++ subversion/trunk/subversion/libsvn_subr/compress_lz4.c Tue Dec 19 22:52:23 
2017
@@ -126,3 +126,17 @@ svn__decompress_lz4(const void *data, ap
 
   return SVN_NO_ERROR;
 }
+
+const char *
+svn_lz4__compiled_version(void)
+{
+  static const char lz4_version_str[] = LZ4_VERSION_STRING;
+
+  return lz4_version_str;
+}
+
+const char *
+svn_lz4__runtime_version(void)
+{
+  return LZ4_versionString();
+}

Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sysinfo.c?rev=1818727&r1=1818726&r2=1818727&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sysinfo.c Tue Dec 19 22:52:23 2017
@@ -127,7 +127,7 @@ const apr_array_header_t *
 svn_sysinfo__linked_libs(apr_pool_t *pool)
 {
   svn_version_ext_linked_lib_t *lib;
-  apr_array_header_t *array = apr_array_make(pool, 6, sizeof(*lib));
+  apr_array_header_t *array = apr_array_make(pool, 7, sizeof(*lib));
 
   lib = &APR_ARRAY_PUSH(array, svn_version_ext_linked_lib_t);
   lib->name = "APR";
@@ -167,6 +167,11 @@ svn_sysinfo__linked_libs(apr_pool_t *poo
   lib->compiled_version = apr_pstrdup(pool, svn_zlib__compiled_version());
   lib->runtime_version = apr_pstrdup(pool, svn_zlib__runtime_version());
 
+  lib = &APR_ARRAY_PUSH(array, svn_version_ext_linked_lib_t);
+  lib->name = "LZ4";
+  lib->compiled_version = apr_pstrdup(pool, svn_lz4__compiled_version());
+  lib->runtime_version = apr_pstrdup(pool, svn_lz4__runtime_version());
+
   return array;
 }