]> jfr.im git - solanum.git/commitdiff
libratbox: Fix sizeof in two memsets.
authorJilles Tjoelker <redacted>
Thu, 15 Jan 2015 22:36:26 +0000 (23:36 +0100)
committerJilles Tjoelker <redacted>
Thu, 15 Jan 2015 22:38:50 +0000 (23:38 +0100)
This fixes a compiler warning. The necessary fields of the struct sigevent
were initialized so there was no problem.

Submitted by: Aaron (via IRC)
Reviewed by: Attila

libratbox/src/epoll.c
libratbox/src/sigio.c

index 480ceed0814888bedeadcf0bd85fa3d7c95f2af2..4f6b13e3d5944a3eb050086ae06fdfd514cb06f3 100644 (file)
@@ -405,7 +405,7 @@ rb_epoll_sched_event_signalfd(struct ev_entry *event, int when)
        struct sigevent ev;
        struct itimerspec ts;
 
-       memset(&ev, 0, sizeof(&ev));
+       memset(&ev, 0, sizeof(ev));
        event->comm_ptr = rb_malloc(sizeof(timer_t));
        id = event->comm_ptr;
        ev.sigev_notify = SIGEV_SIGNAL;
index d63bffce5939afd0d6e84c83e4697d44625bd4bf..2419dd8134153f17de2a977224459b8f2a9f45ed 100644 (file)
@@ -412,7 +412,7 @@ rb_sigio_sched_event(struct ev_entry *event, int when)
        if(can_do_event <= 0)
                return 0;
 
-       memset(&ev, 0, sizeof(&ev));
+       memset(&ev, 0, sizeof(ev));
        event->comm_ptr = rb_malloc(sizeof(timer_t));
        id = event->comm_ptr;
        ev.sigev_notify = SIGEV_SIGNAL;