]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
EventKqueue: Clang want realloc return to be typed 21550/head
authorWillem Jan Withagen <wjw@digiware.nl>
Fri, 20 Apr 2018 08:00:03 +0000 (10:00 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Fri, 20 Apr 2018 08:00:03 +0000 (10:00 +0200)
Otherwise Clang start complaining:
src/msg/async/EventKqueue.cc:202:18: error: assigning to 'struct SaveEvent *' from incompatible type 'void *'
    sav_events = realloc(sav_events, sizeof(struct SaveEvent)*newsize);
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.`

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/msg/async/EventKqueue.cc

index 6db3a3e8ab15da4f7798cddfa51e331728301ee9..026da80295088f12efaf0db5cfb06d8755b48414 100644 (file)
@@ -199,7 +199,7 @@ int KqueueDriver::resize_events(int newsize)
   ldout(cct,30) << __func__ << " kqfd = " << kqfd << "newsize = " << newsize 
                 << dendl;
   if (newsize > sav_max) {
-    sav_events = realloc(sav_events, sizeof(struct SaveEvent)*newsize);
+    sav_events = (struct SaveEvent*)realloc(sav_events, sizeof(struct SaveEvent)*newsize);
     if (!sav_events) {
       lderr(cct) << __func__ << " unable to realloc memory: "
                              << cpp_strerror(errno) << dendl;