Cleaned up compilation warnings (#68)

LLNL · Dec 3, 2018 · f5c4e65 · f5c4e65
1 parent de5d6df
commit f5c4e65
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/src/logging/spindle_logd.cpp b/src/logging/spindle_logd.cpp
@@ -271,11 +271,11 @@ class MsgReader
 
          int result = select(max_fd+1, &rset, NULL, NULL, conns.empty() ? &timeout : NULL);
          if (result == 0) {
-            return NULL;
+            return false;
          }
          if (result == -1) {
             fprintf(stderr, "[%s:%u] - Error calling select: %s\n", __FILE__, __LINE__, strerror(errno));
-            return NULL;
+            return false;
          }
 
          if (sockfd != -1 && FD_ISSET(sockfd, &rset)) {

diff --git a/src/umap/umap.cpp b/src/umap/umap.cpp
@@ -416,14 +416,14 @@ void umap_cfg_set_bufsize( uint64_t page_bufsize )
   long old_size = umap_buffer_size;
 
   if ( page_bufsize > max_size ) {
-    debug_printf("Bufsize of %d larger than maximum of %d.  Setting to %d\n", 
+    debug_printf("Bufsize of %" PRIu64 " larger than maximum of %ld.  Setting to %ld\n", 
         page_bufsize, max_size, max_size);
     umap_buffer_size = max_size;
   }
   else {
     umap_buffer_size = page_bufsize;
   }
-  debug_printf("Bufsize changed from %d to %d pages\n", old_size, umap_buffer_size);
+  debug_printf("Bufsize changed from %ld to %lu pages\n", old_size, umap_buffer_size);
 }
 
 uint64_t umap_cfg_get_uffdthreads( void )
@@ -461,7 +461,7 @@ int umap_cfg_set_pagesize( long psize )
     return -1;
   }
 
-  debug_printf("Adjusting page size from %d to %d\n", umapPageSize, psize);
+  debug_printf("Adjusting page size from %ld to %ld\n", umapPageSize, psize);
 
   umapPageSize = psize;
   return 0;
@@ -728,7 +728,7 @@ UserFaultHandler::UserFaultHandler(_umap* _um, const vector<umap_PageBlock>& _pb
 #endif
     };
 
-    debug_printf2("Register %d Pages from: %p - %p\n", 
+    debug_printf2("Register %lu Pages from: %p - %p\n", 
         (seg.length / umapPageSize), seg.base, 
         (void*)((uint64_t)seg.base + (uint64_t)(seg.length-1)));
 
@@ -1088,7 +1088,7 @@ umap_page* umap_page_buffer::alloc_page_desc(void* page)
     page_buffer_alloc_cnt++;
     p->set_page(page);
     inmem_page_map[page] = p;
-    debug_printf3("%p allocated for %p, free idx=%d alloc idx=%d cnt=%d\n",
+    debug_printf3("%p allocated for %p, free idx=%" PRIu64 " alloc idx=%" PRIu64 " cnt=%" PRIu64 "\n",
         p, page, page_buffer_free_idx, page_buffer_alloc_idx, page_buffer_alloc_cnt);
     return p;
   }
@@ -1106,7 +1106,7 @@ void umap_page_buffer::dealloc_page_desc( void )
                     page_descriptor_array + page_buffer_free_idx : nullptr;
 
   if ( p != nullptr ) {
-    debug_printf3("%p freed for %p, free idx=%d alloc idx=%d cnt=%d\n",
+    debug_printf3("%p freed for %p, free idx=%" PRIu64 " alloc idx=%" PRIu64 " cnt=%" PRIu64 "\n",
         p, p->get_page(), page_buffer_alloc_idx, 
         page_buffer_free_idx, page_buffer_alloc_cnt);
     page_buffer_free_idx = (page_buffer_free_idx + 1) % page_buffer_size;

diff --git a/tests/churn/options.cpp b/tests/churn/options.cpp
@@ -101,18 +101,15 @@ void getoptions(options_t& testops, int& argc, char **argv)
         testops.fn = optarg;
         break;
       case 'w':
-        if ((testops.num_load_writer_threads = strtoull(optarg, nullptr, 0)) >= 0)
-          break;
-        goto R0;
+        testops.num_load_writer_threads = strtoull(optarg, nullptr, 0);
+        break;
       case 'r':
-        if ((testops.num_load_reader_threads = strtoull(optarg, nullptr, 0)) >= 0)
-          break;
+        testops.num_load_reader_threads = strtoull(optarg, nullptr, 0);
+        break;
         goto R0;
       case 't':
-        if ((testops.num_churn_threads = strtoull(optarg, nullptr, 0)) >= 0)
-          break;
-        goto R0;
-
+        testops.num_churn_threads = strtoull(optarg, nullptr, 0);
+        break;
       default:
       R0:
         usage(pname);

diff --git a/tests/utility/commandline.hpp b/tests/utility/commandline.hpp
@@ -137,9 +137,8 @@ void umt_getoptions(utility::umt_optstruct_t* testops, int argc, char *argv[])
           break;
         else goto R0;
       case 'a':
-        if ((testops->pages_to_access = strtoull(optarg, nullptr, 0)) >= 0)
-          break;
-        else goto R0;
+        testops->pages_to_access = strtoull(optarg, nullptr, 0);
+        break;
       case 'd':
         testops->dirname = optarg;
         break;