]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crush: silence warning from -Woverflow
authorJos Collin <jcollin@redhat.com>
Fri, 14 Jul 2017 02:13:51 +0000 (07:43 +0530)
committerJos Collin <jcollin@redhat.com>
Fri, 14 Jul 2017 03:45:50 +0000 (09:15 +0530)
The following warning appears during build:
ceph/src/crush/CrushWrapper.cc: In member function ‘int32_t CrushWrapper::_alloc_class_id() const’:
ceph/src/crush/CrushWrapper.cc:1322:56: warning: integer overflow in expression [-Woverflow]
   uint32_t upperlimit = numeric_limits<int32_t>::max() + 1;
                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
src/crush/CrushWrapper.cc

index 3bdc7d73c31e2461cfc6657c2d40422f3c82eeed..fdcace16d0b28fa71a9245adb9afce0c8d854dac 100644 (file)
@@ -1319,7 +1319,8 @@ int32_t CrushWrapper::_alloc_class_id() const {
     return class_id;
   }
   // wrapped, pick a random start and do exhaustive search
-  uint32_t upperlimit = numeric_limits<int32_t>::max() + 1;
+  uint32_t upperlimit = numeric_limits<int32_t>::max();
+  upperlimit++;
   class_id = rand() % upperlimit;
   const auto start = class_id;
   do {