[freexl] 01/06: Imported Upstream version 1.0.1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Mar 25 07:35:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository freexl.
commit dd594154ad9f0e858327d6649d3677c9491e91c9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Mar 25 08:08:17 2015 +0100
Imported Upstream version 1.0.1
---
config-msvc.h | 4 ++--
configure | 20 ++++++++++----------
configure.ac | 2 +-
headers/freexl.h | 19 +++++++++++++------
src/Makefile.am | 2 +-
src/Makefile.in | 2 +-
src/freexl.c | 12 +++++++++++-
tests/Makefile.am | 3 ++-
tests/Makefile.in | 3 ++-
tests/test_under_valgrind.sh | 6 ++++++
10 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/config-msvc.h b/config-msvc.h
index aba0d8a..0f641eb 100644
--- a/config-msvc.h
+++ b/config-msvc.h
@@ -86,7 +86,7 @@
#define PACKAGE_NAME "FreeXL"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "FreeXL 1.0.0e"
+#define PACKAGE_STRING "FreeXL 1.0.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "freexl"
@@ -107,7 +107,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "1.0.0e"
+#define VERSION "1.0.1"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
diff --git a/configure b/configure
index 91e18df..263ccd5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for FreeXL 1.0.0i.
+# Generated by GNU Autoconf 2.69 for FreeXL 1.0.1.
#
# Report bugs to <a.furieri at lqt.it>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeXL'
PACKAGE_TARNAME='freexl'
-PACKAGE_VERSION='1.0.0i'
-PACKAGE_STRING='FreeXL 1.0.0i'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='FreeXL 1.0.1'
PACKAGE_BUGREPORT='a.furieri at lqt.it'
PACKAGE_URL=''
@@ -1326,7 +1326,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FreeXL 1.0.0i to adapt to many kinds of systems.
+\`configure' configures FreeXL 1.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1396,7 +1396,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeXL 1.0.0i:";;
+ short | recursive ) echo "Configuration of FreeXL 1.0.1:";;
esac
cat <<\_ACEOF
@@ -1508,7 +1508,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeXL configure 1.0.0i
+FreeXL configure 1.0.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2052,7 +2052,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FreeXL $as_me 1.0.0i, which was
+It was created by FreeXL $as_me 1.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2923,7 +2923,7 @@ fi
# Define the identity of the package.
PACKAGE='freexl'
- VERSION='1.0.0i'
+ VERSION='1.0.1'
cat >>confdefs.h <<_ACEOF
@@ -17812,7 +17812,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FreeXL $as_me 1.0.0i, which was
+This file was extended by FreeXL $as_me 1.0.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17878,7 +17878,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-FreeXL config.status 1.0.0i
+FreeXL config.status 1.0.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6f4d3cb..50da6b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(FreeXL, 1.0.0i, a.furieri at lqt.it)
+AC_INIT(FreeXL, 1.0.1, a.furieri at lqt.it)
AC_LANG(C)
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/headers/freexl.h b/headers/freexl.h
index 19ce5ca..a7a7e84 100644
--- a/headers/freexl.h
+++ b/headers/freexl.h
@@ -358,7 +358,7 @@ extern "C"
} value; /**< The value of the data stored in the cell. Which part of
the union is valid is determined by the type value. */
};
-
+
/**
Typedef for cell value structure.
@@ -368,6 +368,13 @@ extern "C"
/**
+ Return the current library version.
+
+ \return the version string.
+ */
+ FREEXL_DECLARE const char *freexl_version (void);
+
+ /**
Open the .xls file, preparing for future functions
\param path full or relative pathname of the input .xls file.
@@ -401,7 +408,7 @@ extern "C"
*/
FREEXL_DECLARE int freexl_open_info (const char *path,
const void **xls_handle);
-
+
/**
Close the .xls file and releasing any allocated resource
@@ -413,7 +420,7 @@ extern "C"
and the handle will no longer be valid.
*/
FREEXL_DECLARE int freexl_close (const void *xls_handle);
-
+
/**
Query general information about the Workbook and Worksheets
@@ -480,7 +487,7 @@ extern "C"
FREEXL_DECLARE int freexl_select_active_worksheet (const void *xls_handle,
unsigned short
sheet_index);
-
+
/**
Query the currently active worksheet index
@@ -534,7 +541,7 @@ extern "C"
FREEXL_DECLARE int freexl_get_SST_string (const void *xls_handle,
unsigned short string_index,
const char **string);
-
+
/**
Retrieve FAT entries from FAT chain
@@ -559,7 +566,7 @@ extern "C"
FREEXL_DECLARE int freexl_get_FAT_entry (const void *xls_handle,
unsigned int sector_index,
unsigned int *next_sector_index);
-
+
/**
Retrieve individual cell values from the currently active worksheet
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a0c899..eb00d14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libfreexl.la
libfreexl_la_SOURCES = freexl.c
-libfreexl_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libfreexl_la_LDFLAGS = -version-info 2:0:1 -no-undefined
libfreexl_la_LIBADD = -lm
diff --git a/src/Makefile.in b/src/Makefile.in
index 4a3e9a0..79c0137 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -316,7 +316,7 @@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)/headers -I$(top_srcdir)
lib_LTLIBRARIES = libfreexl.la
libfreexl_la_SOURCES = freexl.c
-libfreexl_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+libfreexl_la_LDFLAGS = -version-info 2:0:1 -no-undefined
libfreexl_la_LIBADD = -lm
MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
all: all-am
diff --git a/src/freexl.c b/src/freexl.c
index 3bf4742..57b505b 100644
--- a/src/freexl.c
+++ b/src/freexl.c
@@ -79,6 +79,16 @@ extern const char *locale_charset (void);
#include "freexl.h"
#include "freexl_internals.h"
+
+const char *freexlversion = VERSION;
+
+FREEXL_DECLARE const char *
+freexl_version (void)
+{
+/* return the library version number */
+ return freexlversion;
+}
+
#if defined(_WIN32) && !defined(__MINGW32__)
/* MSVC compiler doesn't support lround() at all */
static double
@@ -3759,7 +3769,7 @@ read_biff_next_record (biff_workbook * workbook, int swap, int *errcode)
unsigned int already_done;
unsigned int chunk =
workbook->sector_end - (workbook->p_in - workbook->sector_buf);
- if (workbook->sector_end <= (workbook->p_in - workbook->sector_buf))
+ if (workbook->sector_end < (workbook->p_in - workbook->sector_buf))
return -1;
memcpy (workbook->record, workbook->p_in, chunk);
workbook->p_in += chunk;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c3fa10..04a46a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,4 +39,5 @@ EXTRA_DIST = testdata/oocalc_empty95.xls \
testdata/simple2003_5WB.xls \
testdata/datetime2003.xls \
testdata/testcase1.xls \
- testdata/testbool.xls
+ testdata/testbool.xls \
+ test_under_valgrind.sh
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 83fb3a3..c2e9d2c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -593,7 +593,8 @@ EXTRA_DIST = testdata/oocalc_empty95.xls \
testdata/simple2003_5WB.xls \
testdata/datetime2003.xls \
testdata/testcase1.xls \
- testdata/testbool.xls
+ testdata/testbool.xls \
+ test_under_valgrind.sh
all: all-am
diff --git a/tests/test_under_valgrind.sh b/tests/test_under_valgrind.sh
new file mode 100755
index 0000000..50e792c
--- /dev/null
+++ b/tests/test_under_valgrind.sh
@@ -0,0 +1,6 @@
+#! /bin/bash
+for i in *; do
+if test -x $i -a -f $i -a $i != "test_under_valgrind.sh"; then
+ libtool --mode=execute valgrind --track-origins=yes --tool=memcheck --num-callers=20 --leak-check=full --show-reachable=yes $i
+fi;
+done;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/freexl.git
More information about the Pkg-grass-devel
mailing list