start applying warning fixes from Jan Blunck

[ust.git] / libust / relay.c

diff --git a/libust/relay.c b/libust/relay.c
index 17f63ec0181d84d1515c438319a42c801d6f464e..27794f9e5e2070358d2658b1ab0fa86336d56fc9 100644 (file)
--- a/libust/relay.c
+++ b/libust/relay.c
@@ -26,10 +26,10 @@
 #include <sys/mman.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#include "list.h"
+//#include "list.h"
 #include "relay.h"
 #include "channels.h"
-#include "kref.h"
+#include <kcompat/kref.h>
 #include "tracer.h"
 #include "tracercore.h"
 #include "usterr.h"
@@ -1537,7 +1537,7 @@ static void ltt_chan_alloc_ltt_buf(struct ltt_channel_struct *ltt_chan)
        result = ltt_chan->buf_shmid = shmget(getpid(), size, IPC_CREAT | IPC_EXCL | 0700);
        if(ltt_chan->buf_shmid == -1) {
                PERROR("shmget");
-               return -1;
+               return;
        }
 
        ptr = shmat(ltt_chan->buf_shmid, NULL, 0);
@@ -1552,12 +1552,12 @@ static void ltt_chan_alloc_ltt_buf(struct ltt_channel_struct *ltt_chan)
        result = shmctl(ltt_chan->buf_shmid, IPC_RMID, NULL);
        if(result == -1) {
                perror("shmctl");
-               return -1;
+               return;
        }
 
        ltt_chan->buf = ptr;
 
-       return 0;
+       return;
 
        destroy_shmem:
        result = shmctl(ltt_chan->buf_shmid, IPC_RMID, NULL);
@@ -1565,7 +1565,7 @@ static void ltt_chan_alloc_ltt_buf(struct ltt_channel_struct *ltt_chan)
                perror("shmctl");
        }
 
-       return -1;
+       return;
 }
 
 /*