Skip to content

fix the compiler warnings #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
malb merged 5 commits into from
Apr 28, 2026
Merged

fix the compiler warnings #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef4d35c
refactor time handling in mzd_to_png_fh for cross-platform compatibility
cxzhong Mar 14, 2026
bfcf02d
add conditional compilation for PLE tables based on __M4RI_PLE_NTABLES
cxzhong Mar 14, 2026
246ac17
fix format specifier for hash output in mzd_info function
cxzhong Mar 14, 2026
da69f81
Simpilify local time check
cxzhong Mar 14, 2026
fb85a1b
only localtime_s in msvc
cxzhong Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions m4ri/io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "m4ri_config.h"
#include <inttypes.h>
#include <time.h>

#if __M4RI_HAVE_LIBPNG
#include <png.h>
Expand All @@ -33,7 +34,7 @@
#include "io.h"

void mzd_info(const mzd_t *A, int do_rank) {
printf("nrows: %6d, ncols: %6d, density: %6.5f, hash: 0x%016zx", A->nrows, A->ncols,
printf("nrows: %6d, ncols: %6d, density: %6.5f, hash: 0x%016" PRIx64, A->nrows, A->ncols,
mzd_density(A, 1), mzd_hash(A));
if (do_rank) {
mzd_t *AA = mzd_copy(NULL, A);
Expand Down Expand Up @@ -235,10 +236,15 @@ int mzd_to_png_fh(const mzd_t *A, FILE *fh, int compression_level, const char *c
png_text txt_ptr[3];

char pdate[21];
time_t ptime = time(NULL);
struct tm *ltime = localtime(&ptime);
sprintf(pdate, "%04d/%02d/%02d %02d:%02d:%02d", ltime->tm_year + 1900, ltime->tm_mon + 1,
ltime->tm_mday, ltime->tm_hour, ltime->tm_min, ltime->tm_sec);
time_t ptime = time(NULL);
struct tm ltime;
#if defined(_WIN32) && defined(_MSC_VER)
localtime_s(&ltime, &ptime);
#else
localtime_r(&ptime, &ltime);
#endif
if (strftime(pdate, sizeof(pdate), "%Y/%m/%d %H:%M:%S", &ltime) == 0)
pdate[0] = '\0';

txt_ptr[0].key = "Software";
txt_ptr[0].text = "M4RI";
Expand Down
2 changes: 2 additions & 0 deletions m4ri/ple_russian.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ rci_t _mzd_ple_russian(mzd_t *A, mzp_t *P, mzp_t *Q, int k) {
}

switch (ntables) {
#if __M4RI_PLE_NTABLES >= 8
case 8:
/**
* 5. update A1 = (A01 | A11) */
Expand All @@ -540,6 +541,7 @@ rci_t _mzd_ple_russian(mzd_t *A, mzp_t *P, mzp_t *Q, int k) {
if (done_row < nrows)
_mzd_process_rows_ple_8(A, done_row + 1, nrows, curr_col, k_, (const ple_table_t **)T);
break;
#endif

case 7:
_mzd_ple_a11_7(A, curr_row + knar, done_row + 1, curr_col, splitblock, k_,
Expand Down