Merge pull request #221 from liulanzheng/main

fix all sign-compare warnings

Author: yuchen0cc

CMakeLists.txt

@@ -17,8 +17,8 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/build/output")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpic")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic -Wall -Werror=sign-compare")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpic -Wall -Werror=sign-compare")
 
 if (${ARCH} STREQUAL aarch64)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")

src/bk_download.cpp

@@ -55,7 +55,7 @@ std::string sha256sum(const char *fn) {
     SHA256_Init(&ctx);
     __attribute__((aligned(ALIGNMENT))) char buffer[65536];
     unsigned char sha[32];
-    int recv = 0;
+    ssize_t recv = 0;
     for (off_t offset = 0; offset < stat.st_size; offset += BUFFERSIZE) {
         recv = pread(fd, &buffer, BUFFERSIZE, offset);
         if (recv < 0) {

src/overlaybd/cache/download_cache/download_cache.cpp

@@ -226,13 +226,13 @@ ssize_t DownloadCacheFile::preadv(const struct iovec *iov, int iovcnt, off_t off
         read = m_file->preadv(buffer.iovec(), buffer.iovcnt(), r_offset);
     }
 
-    if (read != r_count) {
+    if (read != (ssize_t)r_count) {
         LOG_ERRNO_RETURN(0, -1, "src file read failed, read: `, expect: `, size: `, offset: `",
                          read, r_count, m_size, r_offset);
     }
 
     auto write = m_local_file->pwritev(buffer.iovec(), buffer.iovcnt(), r_offset);
-    if (write != r_count) {
+    if (write != (ssize_t)r_count) {
         LOG_ERRNO_RETURN(0, -1, "local file write failed, write: `, expect: `, size: `, offset: `",
                          write, r_count, m_size, r_offset);
     }

src/overlaybd/cache/ocf_cache/CMakeLists.txt

@@ -12,6 +12,7 @@ file(GLOB_RECURSE src_ocf ocf/src/*.c)
 add_library(ocf_lib STATIC ${src_ocf})
 target_include_directories(ocf_lib PUBLIC include/ ease_bindings/env/)
 target_link_libraries(ocf_lib ocf_env_lib z)
+target_compile_options(ocf_lib PUBLIC -Wno-sign-compare)
 
 # ocf_cache_lib
 file(GLOB src_ocf_cache ocf_cache.cpp ocf_namespace.cpp ease_bindings/*.cpp)

src/overlaybd/cache/ocf_cache/ocf_cache.cpp

@@ -191,7 +191,7 @@ int OcfCachedFile::fadvise(off_t offset, off_t len, int advice) {
     if (advice == POSIX_FADV_WILLNEED) {
         void *buf = m_fs->get_io_alloc()->alloc(len);
         DEFER(m_fs->get_io_alloc()->dealloc(buf));
-        int ret = pread(buf, len, offset);
+        auto ret = pread(buf, len, offset);
         if (ret < 0) {
             LOG_ERROR_RETURN(0, -1, "prefetch read failed");
         }

src/overlaybd/extfs/extfs.cpp

@@ -813,7 +813,7 @@ int do_ext2fs_access(ext2_filsys fs, const char *path, int mode) {
     mode_t perms = inode.i_mode & 0777;
     if ((mode & W_OK) && (inode.i_flags & EXT2_IMMUTABLE_FL))
         return -EACCES;
-    if ((mode & perms) == mode)
+    if ((mode & perms) == (mode_t)mode)
         return 0;
     return -EACCES;
 }
@@ -996,7 +996,7 @@ int do_ext2fs_fiemap(ext2_filsys fs, ext2_ino_t ino, struct photon::fs::fiemap*
     if (ret) return parse_extfs_error(fs, ino, ret);
     map->fm_mapped_extents = blocks.size();
     photon::fs::fiemap_extent *ext_buf = &map->fm_extents[0];
-    for (int i = 0; i < blocks.size(); i++) {
+    for (uint32_t i = 0; i < blocks.size(); i++) {
         LOG_DEBUG("find block ` `", blocks[i].first * fs->blocksize, blocks[i].second * fs->blocksize);
         ext_buf[i].fe_physical = blocks[i].first * fs->blocksize;
         ext_buf[i].fe_length = blocks[i].second * fs->blocksize;

src/overlaybd/lsmt/file.cpp

@@ -180,7 +180,7 @@ struct HeaderTrailer {
 
 class LSMTReadOnlyFile;
 static LSMTReadOnlyFile *open_file_ro(IFile *file, bool ownership, bool reserve_tag);
-static HeaderTrailer *verify_ht(IFile *file, char *buf, bool is_trailer = false, size_t st_size = -1);
+static HeaderTrailer *verify_ht(IFile *file, char *buf, bool is_trailer = false, ssize_t st_size = -1);
 
 static const uint32_t ALIGNMENT = 512; // same as trim block size.
 static const uint32_t ALIGNMENT4K = 4096;
@@ -1111,7 +1111,7 @@ class LSMTWarpFile : public LSMTFile {
         LOG_DEBUG("write index to dest_file `, offset: `, size: `*`", dest_file, index_offset,
                   index_size, sizeof(SegmentMapping));
         auto nwrite = dest_file->write(&compact_index[0], index_size * sizeof(SegmentMapping));
-        if (nwrite != (ssize_t)index_size * sizeof(SegmentMapping)) {
+        if (nwrite != (ssize_t)(index_size * sizeof(SegmentMapping))) {
             LOG_ERRNO_RETURN(0, -1, "write index failed");
         }
         nindex = index_size;
@@ -1145,7 +1145,7 @@ class LSMTWarpFile : public LSMTFile {
     }
 };
 
-static HeaderTrailer *verify_ht(IFile *file, char *buf, bool is_trailer, size_t st_size) {
+static HeaderTrailer *verify_ht(IFile *file, char *buf, bool is_trailer, ssize_t st_size) {
     if (file == nullptr) {
         LOG_ERRNO_RETURN(0, nullptr, "invalid file ptr (null).");
     }

src/overlaybd/registryfs/registryfs.cpp

@@ -403,7 +403,7 @@ class RegistryFileImpl : public photon::fs::VirtualReadOnlyFile {
     again:
         photon::net::IOVWriter container(iov, iovcnt);
         auto count = container.sum();
-        if ((ssize_t)count + offset > filesize)
+        if (count + offset > filesize)
             count = filesize - offset;
         LOG_DEBUG("pulling blob from docker registry: ", VALUE(m_url), VALUE(offset), VALUE(count));
 

src/overlaybd/registryfs/registryfs_v2.cpp

@@ -356,7 +356,7 @@ class RegistryFileImpl_v2 : public photon::fs::VirtualReadOnlyFile {
     again:
         iovector_view view((struct iovec*)iov, iovcnt);
         auto count = view.sum();
-        if ((ssize_t)count + offset > filesize)
+        if (count + offset > filesize)
             count = filesize - offset;
         LOG_DEBUG("pulling blob from registry: ", VALUE(m_url), VALUE(offset), VALUE(count));
 

src/overlaybd/tar/libtar.cpp

@@ -207,7 +207,7 @@ int UnTar::extract_regfile_meta_only(const char *filename) {
     fout->fallocate(0, 0, size);
     struct photon::fs::fiemap_t<8192> fie(0, size);
     fout->fiemap(&fie);
-    for (int i = 0; i < fie.fm_mapped_extents; i++) {
+    for (uint32_t i = 0; i < fie.fm_mapped_extents; i++) {
         LSMT::RemoteMapping lba;
         lba.offset = fie.fm_extents[i].fe_physical;
         lba.count = fie.fm_extents[i].fe_length;
@@ -252,11 +252,11 @@ int UnTar::extract_regfile(const char *filename) {
             rsz = left & fs_blockmask;
         else
             rsz = (left & ~T_BLOCKMASK) ? (left & T_BLOCKMASK) + T_BLOCKSIZE : (left & T_BLOCKMASK);
-        if (file->read(buf, rsz) != rsz) {
+        if (file->read(buf, rsz) != (ssize_t)rsz) {
             LOG_ERRNO_RETURN(0, -1, "failed to read block");
         }
         size_t wsz = (left < rsz) ? left : rsz;
-        if (fout->pwrite(buf, wsz, pos) != wsz) {
+        if (fout->pwrite(buf, wsz, pos) != (ssize_t)wsz) {
             LOG_ERRNO_RETURN(0, -1, "failed to write file");
         }
         pos += wsz;