No commit message

brechtsanders · Mar 24, 2020 · b9399e5 · b9399e5
1 parent 48f6c3a
commit b9399e5
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 30 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,10 @@
 0.2.26
 
+2020-03-20  Brecht Sanders  https://github.com/brechtsanders/
+
+  * accepted patch (#63) to add xlsxioread_sheet_last_column_index() and xlsxioread_sheet_flags()
+  * added xlsxioread_sheet_last_row_index()
+
 0.2.25
 
 2020-03-20  Brecht Sanders  https://github.com/brechtsanders/

diff --git a/build/example_xlsxio_read_wchar.depend b/build/example_xlsxio_read_wchar.depend
@@ -31,7 +31,7 @@
 	<fcntl.h>
 	"xlsxio_read.h"
 
-1583781556 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>

diff --git a/build/libxlsxio_read_minizip_shared.depend b/build/libxlsxio_read_minizip_shared.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1584629398 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
@@ -21,13 +21,13 @@
 	<stdint.h>
 	<expat.h>
 
-1583781556 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1584573783 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
 1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"

diff --git a/build/libxlsxio_read_shared.depend b/build/libxlsxio_read_shared.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1584573202 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
@@ -21,13 +21,13 @@
 	<stdint.h>
 	<expat.h>
 
-1583781556 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1583791822 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
 1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"

diff --git a/build/libxlsxio_read_wchar.depend b/build/libxlsxio_read_wchar.depend
@@ -1,13 +1,13 @@
 # depslib dependency file v1.0
-1583791626 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
 	"xlsxio_version.h"
 	<stdlib.h>
+	<stdio.h>
 	<inttypes.h>
 	<string.h>
-	<stdio.h>
 	<expat.h>
 	<minizip/unzip.h>
 	<io.h>
@@ -21,13 +21,13 @@
 	<stdint.h>
 	<expat.h>
 
-1583781556 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1583791822 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
 1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"

diff --git a/build/libxlsxio_read_wchar_shared.depend b/build/libxlsxio_read_wchar_shared.depend
@@ -1,13 +1,13 @@
 # depslib dependency file v1.0
-1583791626 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
+1585047177 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read.c
 	"xlsxio_private.h"
 	"xlsxio_read_sharedstrings.h"
 	"xlsxio_read.h"
 	"xlsxio_version.h"
 	<stdlib.h>
+	<stdio.h>
 	<inttypes.h>
 	<string.h>
-	<stdio.h>
 	<expat.h>
 	<minizip/unzip.h>
 	<io.h>
@@ -21,13 +21,13 @@
 	<stdint.h>
 	<expat.h>
 
-1583781556 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
+1585047181 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_read.h
 	<stdlib.h>
 	<stdint.h>
 	<time.h>
 	<wchar.h>
 
-1583791822 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
 1522317802 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_read_sharedstrings.c
 	"xlsxio_private.h"

diff --git a/build/libxlsxio_write_minizip_shared.depend b/build/libxlsxio_write_minizip_shared.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1583791790 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
+1584724326 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
 	"xlsxio_write.h"
 	"xlsxio_version.h"
 	<stdlib.h>
@@ -20,5 +20,5 @@
 	<stdint.h>
 	<time.h>
 
-1583791822 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
diff --git a/build/libxlsxio_write_shared.depend b/build/libxlsxio_write_shared.depend
@@ -20,5 +20,5 @@
 	<stdint.h>
 	<time.h>
 
-1584629600 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
diff --git a/build/libxlsxio_write_wchar.depend b/build/libxlsxio_write_wchar.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1583791790 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
+1584724326 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
 	"xlsxio_write.h"
 	"xlsxio_version.h"
 	<stdlib.h>
@@ -20,5 +20,5 @@
 	<stdint.h>
 	<time.h>
 
-1583791822 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
diff --git a/build/libxlsxio_write_wchar_shared.depend b/build/libxlsxio_write_wchar_shared.depend
@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1583791790 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
+1584724326 source:\\server\users\brecht\sources\cpp\xlsxio\lib\xlsxio_write.c
 	"xlsxio_write.h"
 	"xlsxio_version.h"
 	<stdlib.h>
@@ -20,5 +20,5 @@
 	<stdint.h>
 	<time.h>
 
-1583791822 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
+1584725129 \\server\users\brecht\sources\cpp\xlsxio\include\xlsxio_version.h
 
diff --git a/include/xlsxio_read.h b/include/xlsxio_read.h
@@ -224,17 +224,23 @@ DLL_EXPORT_XLSXIO const XLSXIOCHAR* xlsxioread_sheetlist_next (xlsxioreadersheet
 /*! \brief read handle for worksheet object */
 typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet;
 
-/*! \brief get the index of the last column of the current worksheet row
+/*! \brief get index of last row read from worksheet (returns 0 if no row was read yet)
  * \param  sheethandle   read handle for worksheet object
  * \sa     xlsxioread_sheet_open()
  */
-DLL_EXPORT_XLSXIO int xlsxioread_sheet_last_column_index(xlsxioreadersheet sheethandle);
+DLL_EXPORT_XLSXIO size_t xlsxioread_sheet_last_row_index (xlsxioreadersheet sheethandle);
 
-/*! \brief get worksheet open flags
+/*! \brief get index of last column read from current row in worksheet (returns 0 if no column was read yet)
  * \param  sheethandle   read handle for worksheet object
  * \sa     xlsxioread_sheet_open()
  */
-DLL_EXPORT_XLSXIO unsigned int xlsxioread_sheet_flags(xlsxioreadersheet sheethandle);
+DLL_EXPORT_XLSXIO size_t xlsxioread_sheet_last_column_index (xlsxioreadersheet sheethandle);
+
+/*! \brief get flags used to open worksheet
+ * \param  sheethandle   read handle for worksheet object
+ * \sa     xlsxioread_sheet_open()
+ */
+DLL_EXPORT_XLSXIO unsigned int xlsxioread_sheet_flags (xlsxioreadersheet sheethandle);
 
 /*! \brief open worksheet
  * \param  handle        read handle for .xlsx object

diff --git a/lib/xlsxio_read.c b/lib/xlsxio_read.c
@@ -1262,15 +1262,19 @@ struct xlsxio_read_sheet_struct {
   size_t paddingcol;
 };
 
-DLL_EXPORT_XLSXIO int xlsxioread_sheet_last_column_index(xlsxioreadersheet sheethandle)
+DLL_EXPORT_XLSXIO size_t xlsxioread_sheet_last_row_index (xlsxioreadersheet sheethandle)
 {
-    return (int)sheethandle->lastcolnr;
+  return sheethandle->lastrownr;
 }
 
+DLL_EXPORT_XLSXIO size_t xlsxioread_sheet_last_column_index (xlsxioreadersheet sheethandle)
+{
+  return sheethandle->lastcolnr;
+}
 
-DLL_EXPORT_XLSXIO unsigned int xlsxioread_sheet_flags(xlsxioreadersheet sheethandle)
+DLL_EXPORT_XLSXIO unsigned int xlsxioread_sheet_flags (xlsxioreadersheet sheethandle)
 {
-    return (int)sheethandle->processcallbackdata.flags;
+  return sheethandle->processcallbackdata.flags;
 }
 
 DLL_EXPORT_XLSXIO int xlsxioread_process (xlsxioreader handle, const XLSXIOCHAR* sheetname, unsigned int flags, xlsxioread_process_cell_callback_fn cell_callback, xlsxioread_process_row_callback_fn row_callback, void* callbackdata)