Applied updates

libyal · Jul 18, 2018 · 874b10f · 874b10f
1 parent 43bcb10
commit 874b10f
Show file tree

Hide file tree

Showing 25 changed files with 121 additions and 57 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,7 +47,7 @@ matrix:
     sudo: required
     group: edge
 before_install:
-  - if test ${TRAVIS_OS_NAME} = "linux"; then sudo apt-get update && sudo apt-mark hold oracle-java9-installer postgresql-9.2 postgresql-9.3 postgresql-9.4 postgresql-9.5 postgresql-9.6 postgresql-client postgresql-client-common postgresql-common postgresql-contrib-9.2 postgresql-contrib-9.3 postgresql-contrib-9.4 postgresql-contrib-9.5 postgresql-contrib-9.6 postgresql-doc && sudo apt-get --fix-missing -o Dpkg::Options::="--force-confold" upgrade -y && sudo apt-get install -y autopoint; fi
+  - if test ${TRAVIS_OS_NAME} = "linux"; then sudo apt-get update && sudo apt-mark hold oracle-java8-installer oracle-java9-installer postgresql-9.2 postgresql-9.3 postgresql-9.4 postgresql-9.5 postgresql-9.6 postgresql-client postgresql-client-common postgresql-common postgresql-contrib-9.2 postgresql-contrib-9.3 postgresql-contrib-9.4 postgresql-contrib-9.5 postgresql-contrib-9.6 postgresql-doc && sudo apt-get --fix-missing -o Dpkg::Options::="--force-confold" upgrade -y --allow-unauthenticated && sudo apt-get install -y autopoint; fi
   - if test ${TRAVIS_OS_NAME} = "osx"; then brew update && brew install gettext gnu-sed && brew link --force gettext; fi
   - if test ${TARGET} = "coverity"; then echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-; fi
 install:

diff --git a/common/types.h.in b/common/types.h.in
@@ -59,7 +59,7 @@ typedef int system_integer_t;
 
 #endif /* defined( WINAPI ) && ( defined( _UNICODE ) || defined( UNICODE ) ) */
 
-/* Fix for systems without PRI definitions
+/* Fallback for systems without PRI definitions
  */
 #if !defined( PRId8 )
 #define PRId8 "d"
@@ -77,7 +77,7 @@ typedef int system_integer_t;
 #define PRId32 "d"
 
 #endif
-#endif
+#endif /* !defined( PRId32 ) */
 
 #if !defined( PRId64 )
 #if defined( WINAPI )
@@ -90,7 +90,7 @@ typedef int system_integer_t;
 #define PRId64 "lld"
 
 #endif
-#endif
+#endif /* !defined( PRId64 ) */
 
 #if !defined( PRIi8 )
 #define PRIi8 "i"
@@ -108,7 +108,7 @@ typedef int system_integer_t;
 #define PRIi32 "i"
 
 #endif
-#endif
+#endif /* !defined( PRIi32 ) */
 
 #if !defined( PRIi64 )
 #if defined( WINAPI )
@@ -121,7 +121,7 @@ typedef int system_integer_t;
 #define PRIi64 "lli"
 
 #endif
-#endif
+#endif /* !defined( PRIi64 ) */
 
 #if !defined( PRIu8 )
 #define PRIu8 "u"
@@ -139,7 +139,7 @@ typedef int system_integer_t;
 #define PRIu32 "u"
 
 #endif
-#endif
+#endif /* !defined( PRIu32 ) */
 
 #if !defined( PRIu64 )
 #if defined( WINAPI )
@@ -152,7 +152,38 @@ typedef int system_integer_t;
 #define PRIu64 "llu"
 
 #endif
+#endif /* !defined( PRIu64 ) */
+
+#if !defined( PRIo8 )
+#define PRIo8 "o"
+#endif
+
+#if !defined( PRIo16 )
+#define PRIo16 "o"
+#endif
+
+#if !defined( PRIo32 )
+#if defined( WINAPI )
+#define PRIo32 "I32o"
+
+#else
+#define PRIo32 "o"
+
+#endif
+#endif /* !defined( PRIo32 ) */
+
+#if !defined( PRIo64 )
+#if defined( WINAPI )
+#define PRIo64 "I64o"
+
+#elif __WORDSIZE == 64
+#define PRIo64 "lo"
+
+#else
+#define PRIo64 "llo"
+
 #endif
+#endif /* !defined( PRIo64 ) */
 
 #if !defined( PRIx8 )
 #define PRIx8 "x"
@@ -170,7 +201,7 @@ typedef int system_integer_t;
 #define PRIx32 "x"
 
 #endif
-#endif
+#endif /* !defined( PRIx32 ) */
 
 #if !defined( PRIx64 )
 #if defined( WINAPI )
@@ -183,9 +214,9 @@ typedef int system_integer_t;
 #define PRIx64 "llx"
 
 #endif
-#endif
+#endif /*!defined( PRIx64 ) */
 
-/* Fix for systems without printf %jd definition
+/* Fallback for systems without printf %jd definition
  */
 #if defined( HAVE_PRINTF_JD )
 #define PRIjd	"jd"
@@ -205,9 +236,9 @@ typedef int system_integer_t;
 #define PRIju	PRIu32
 #define PRIjx	PRIx32
 
-#endif
+#endif /* defined( HAVE_PRINTF_JD ) */
 
-/* Fix for systems without printf %zd definition
+/* Fallback for systems without printf %zd definition
  */
 #if defined( HAVE_PRINTF_ZD )
 #define PRIzd	"zd"
@@ -233,9 +264,9 @@ typedef int system_integer_t;
 #define PRIzu	PRIu32
 #define PRIzx	PRIx32
 
-#endif
+#endif /* defined( HAVE_PRINTF_ZD ) */
 
-/* Fix for systems without (U)INTx_MAX definitions
+/* Fallback for systems without (U)INTx_MAX definitions
  */
 
 /* The maximum signed 8-bit integer is 127 (0x7f)
@@ -250,7 +281,7 @@ typedef int system_integer_t;
 #define UINT8_MAX (0xff)
 #endif
 
-/* The maximum signed 16-bit integer is 32767 (0xr7ffff)
+/* The maximum signed 16-bit integer is 32767 (0x7ffff)
  */
 #if !defined( INT16_MAX )
 #define INT16_MAX (0x7fff)
@@ -282,7 +313,7 @@ typedef int system_integer_t;
 #else
 #define INT64_MAX (0x7fffffffffffffffULL)
 #endif
-#endif
+#endif /* !defined( INT64_MAX ) */
 
 /* The maximum unsigned 64-bit integer is 18446744073709551615 (0xffffffffffffffff)
  */
@@ -292,7 +323,7 @@ typedef int system_integer_t;
 #else
 #define UINT64_MAX (0xffffffffffffffffULL)
 #endif
-#endif
+#endif /* !defined( UINT64_MAX ) */
 
 /* The maximum signed integer
  */
@@ -316,15 +347,15 @@ typedef int system_integer_t;
 #define SSIZE_MAX INT64_MAX
 #else
 #define SSIZE_MAX INT32_MAX
-#endif /* _WIN64 */
+#endif
 
 #else
 
 #if __WORDSIZE == 64
 #define SSIZE_MAX INT64_MAX
 #else
 #define SSIZE_MAX INT32_MAX
-#endif /* __WORDSIZE == 64 */
+#endif
 
 #endif /* WINAPI */
 

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
 
 AC_INIT(
  [libevtx],
- [20180413],
+ [20180718],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(

diff --git a/evtxtools/evtxtools_libcerror.h b/evtxtools/evtxtools_libcerror.h
@@ -1,5 +1,5 @@
 /*
- * The internal libcerror header
+ * The libcerror header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/evtxtools/evtxtools_libclocale.h b/evtxtools/evtxtools_libclocale.h
@@ -1,5 +1,5 @@
 /*
- * The internal libclocale header
+ * The libclocale header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/evtxtools/evtxtools_libcnotify.h b/evtxtools/evtxtools_libcnotify.h
@@ -1,5 +1,5 @@
 /*
- * The internal libcnotify header
+ * The libcnotify header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/evtxtools/evtxtools_libcpath.h b/evtxtools/evtxtools_libcpath.h
@@ -1,5 +1,5 @@
 /*
- * The internal libcpath header
+ * The libcpath header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/evtxtools/evtxtools_libevtx.h b/evtxtools/evtxtools_libevtx.h
@@ -1,5 +1,5 @@
 /*
- * The internal libevtx header
+ * The libevtx header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/evtxtools/evtxtools_libfcache.h b/evtxtools/evtxtools_libfcache.h
@@ -1,5 +1,5 @@
 /*
- * The internal libfcache header
+ * The libfcache header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/libevtx/libevtx_extern.h b/libevtx/libevtx_extern.h
@@ -37,8 +37,11 @@
 
 #include <libevtx/extern.h>
 
+#define LIBEVTX_EXTERN_VARIABLE	LIBEVTX_EXTERN
+
 #else
-#define LIBEVTX_EXTERN	/* extern */
+#define LIBEVTX_EXTERN		/* extern */
+#define LIBEVTX_EXTERN_VARIABLE	extern
 
 #endif /* !defined( HAVE_LOCAL_LIBEVTX ) */
 

diff --git a/libevtx/libevtx_i18n.c b/libevtx/libevtx_i18n.c
@@ -1,7 +1,7 @@
 /*
  * Internationalization (i18n) functions
  *
- * Copyright (C) 2012-2018, Joachim Metz <joachim.metz@gmail.com>
+ * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *
  * Refer to AUTHORS for acknowledgements.
  *

diff --git a/libevtx/libevtx_libcdata.h b/libevtx/libevtx_libcdata.h
@@ -1,5 +1,5 @@
 /*
- * The internal libcdata header
+ * The libcdata header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/libevtx/libevtx_libcerror.h b/libevtx/libevtx_libcerror.h
@@ -1,5 +1,5 @@
 /*
- * The internal libcerror header
+ * The libcerror header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/libevtx/libevtx_libclocale.h b/libevtx/libevtx_libclocale.h
@@ -1,5 +1,5 @@
 /*
- * The internal libclocale header
+ * The libclocale header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/libevtx/libevtx_libcnotify.h b/libevtx/libevtx_libcnotify.h
@@ -1,5 +1,5 @@
 /*
- * The internal libcnotify header
+ * The libcnotify header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/libevtx/libevtx_libfcache.h b/libevtx/libevtx_libfcache.h
@@ -1,5 +1,5 @@
 /*
- * The internal libfcache header
+ * The libfcache header wrapper
  *
  * Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
  *

diff --git a/m4/libcpath.m4 b/m4/libcpath.m4
@@ -1,6 +1,6 @@
 dnl Checks for libcpath or required headers and functions
 dnl
-dnl Version: 20180407
+dnl Version: 20180716
 
 dnl Function to detect if libcpath is available
 dnl ac_libcpath_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l<library> arguments
@@ -24,7 +24,7 @@ AC_DEFUN([AX_LIBCPATH_CHECK_LIB],
       [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"],
       [PKG_CHECK_MODULES(
         [libcpath],
-        [libcpath >= 20120701],
+        [libcpath >= 20180716],
         [ac_cv_libcpath=yes],
         [ac_cv_libcpath=check])
       ])
@@ -91,22 +91,22 @@ AC_DEFUN([AX_LIBCPATH_CHECK_LIB],
           [ac_cv_libcpath=no])
         AC_CHECK_LIB(
           cpath,
-          libcpath_path_join,
+          libcpath_path_get_sanitized_filename,
           [ac_cv_libcpath_dummy=yes],
           [ac_cv_libcpath=no])
         AC_CHECK_LIB(
           cpath,
-          libcpath_path_make_directory,
+          libcpath_path_get_sanitized_path,
           [ac_cv_libcpath_dummy=yes],
           [ac_cv_libcpath=no])
         AC_CHECK_LIB(
           cpath,
-          libcpath_path_sanitize,
+          libcpath_path_join,
           [ac_cv_libcpath_dummy=yes],
           [ac_cv_libcpath=no])
         AC_CHECK_LIB(
           cpath,
-          libcpath_path_sanitize_filename,
+          libcpath_path_make_directory,
           [ac_cv_libcpath_dummy=yes],
           [ac_cv_libcpath=no])
 
@@ -129,22 +129,22 @@ AC_DEFUN([AX_LIBCPATH_CHECK_LIB],
             [ac_cv_libcpath=no])
           AC_CHECK_LIB(
             cpath,
-            libcpath_path_join_wide,
+            libcpath_path_get_sanitized_filename_wide,
             [ac_cv_libcpath_dummy=yes],
             [ac_cv_libcpath=no])
           AC_CHECK_LIB(
             cpath,
-            libcpath_path_make_directory_wide,
+            libcpath_path_get_sanitized_path_wide,
             [ac_cv_libcpath_dummy=yes],
             [ac_cv_libcpath=no])
           AC_CHECK_LIB(
             cpath,
-            libcpath_path_sanitize_wide,
+            libcpath_path_join_wide,
             [ac_cv_libcpath_dummy=yes],
             [ac_cv_libcpath=no])
           AC_CHECK_LIB(
             cpath,
-            libcpath_path_sanitize_filename_wide,
+            libcpath_path_make_directory_wide,
             [ac_cv_libcpath_dummy=yes],
             [ac_cv_libcpath=no])
           ])