Three portability fixes around integer width

This unbreaks the dqlite build on alpha and x32. Co-authored-by: Mathias Gibbens <[email protected]> Signed-off-by: Cole Miller <[email protected]>
canonical · Apr 23, 2024 · 8225191 · 8225191
1 parent 9578db5
commit 8225191
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/raft/uv_fs.c b/src/raft/uv_fs.c
@@ -704,15 +704,9 @@ static int probeDirectIO(int fd, size_t *size, char *errmsg)
 			default:
 				/* UNTESTED: this is an unsupported file system.
 				 */
-#if defined(__s390x__)
 				ErrMsgPrintf(errmsg,
-					     "unsupported file system: %ux",
-					     fs_info.f_type);
-#else
-				ErrMsgPrintf(errmsg,
-					     "unsupported file system: %zx",
-					     fs_info.f_type);
-#endif
+					     "unsupported file system: %llx",
+					     (unsigned long long)fs_info.f_type);
 				return RAFT_IOERR;
 		}
 	}

diff --git a/src/raft/uv_os.c b/src/raft/uv_os.c
@@ -52,7 +52,7 @@ int UvOsFallocateEmulation(int fd, off_t offset, off_t len)
 	if (f.f_bsize == 0) {
 		increment = 512;
 	} else if (f.f_bsize < 4096) {
-		increment = f.f_bsize;
+		increment = (ssize_t)f.f_bsize;
 	} else {
 		increment = 4096;
 	}

diff --git a/src/tracing.c b/src/tracing.c
@@ -79,7 +79,7 @@ static inline void tracerEmit(const char *file,
 		tracerPidCached,
 
 		tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour,
-		tm.tm_min, tm.tm_sec, ts.tv_nsec,
+		tm.tm_min, tm.tm_sec, (unsigned long)ts.tv_nsec,
 
 		(unsigned)tid, tracerTraceLevelName(level), func,
 		tracerShortFileName(file), line, message);