c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for unixtime type size.

Browse Source 
The size of thetime_h type used with worksheet_write_unixtime()
wasn't sufficient to represent the full range of Excel's dates.
The parameter in question has been extended to int64_t.

Issue #347
This commit is contained in:
John McNamara 2021-07-27 17:28:10 +01:00
parent b2b7000c42
commit 9402191bc1
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/xlsxwriter/utility.h
View File

@ -214,9 +214,9 @@ double lxw_datetime_to_excel_date_epoch(lxw_datetime *datetime,
*
* See @ref working_with_dates for more details.
*/
double lxw_unixtime_to_excel_date(time_t unixtime);
double lxw_unixtime_to_excel_date(int64_t unixtime);
double lxw_unixtime_to_excel_date_epoch(time_t unixtime, uint8_t date_1904);
double lxw_unixtime_to_excel_date_epoch(int64_t unixtime, uint8_t date_1904);
char *lxw_strdup(const char *str);
char *lxw_strdup_formula(const char *formula);

7
include/xlsxwriter/worksheet.h
View File

@ -2241,12 +2241,17 @@ lxw_error worksheet_write_datetime(lxw_worksheet *worksheet,
*
* @image html date_example03.png
*
* Unixtime is generally represented with a 32 bit `time_t` type which has a
* range of approximately 1900-12-14 to 2038-01-19. To access the full Excel
* date range of 1900-01-01 to 9999-12-31 this function uses a 64 bit
* parameter.
*
* See @ref working_with_dates for more information about handling dates and
* times in libxlsxwriter.
*/
lxw_error worksheet_write_unixtime(lxw_worksheet *worksheet,
lxw_row_t row,
lxw_col_t col, time_t unixtime,
lxw_col_t col, int64_t unixtime,
lxw_format *format);
/**

4
src/utility.c
View File

@ -428,7 +428,7 @@ lxw_datetime_to_excel_datetime(lxw_datetime *datetime)
* 1900 epoch.
*/
double
lxw_unixtime_to_excel_date(time_t unixtime)
lxw_unixtime_to_excel_date(int64_t unixtime)
{
return lxw_unixtime_to_excel_date_epoch(unixtime, LXW_FALSE);
}
@ -438,7 +438,7 @@ lxw_unixtime_to_excel_date(time_t unixtime)
* 1900 or 1904 epoch.
*/
double
lxw_unixtime_to_excel_date_epoch(time_t unixtime, uint8_t date_1904)
lxw_unixtime_to_excel_date_epoch(int64_t unixtime, uint8_t date_1904)
{
double excel_datetime = 0.0;
int epoch = date_1904 ? 24107.0 : 25568.0;

2
src/worksheet.c
View File

@ -7204,7 +7204,7 @@ lxw_error
worksheet_write_unixtime(lxw_worksheet *self,
lxw_row_t row_num,
lxw_col_t col_num,
time_t unixtime, lxw_format *format)
int64_t unixtime, lxw_format *format)
{
lxw_cell *cell;
double excel_date;

4
test/unit/helper.h
View File

@ -12,7 +12,7 @@
got = (char*)calloc(file_size + 1, 1); \
\
rewind(testfile); \
fread(got, file_size, 1, testfile); \
(void)fread(got, file_size, 1, testfile); \
\
ASSERT_STR((exp), (got)); \
\
@ -32,7 +32,7 @@
got = (char*)calloc(file_size + 1, 1); \
\
rewind(testfile); \
fread(got, file_size, 1, testfile); \
(void)fread(got, file_size, 1, testfile); \
\
/* Start comparison from first difference. */ \
char *got_short = got; \