Merge branch 't/clang_analyzer_fixes'

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index 337045c9a6fd65ac05e412d5eb453401bbaa9436..955b8f207d5305418674f6a0f2e30f904d110517 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -19,9 +19,6 @@
 #include "afh.h"
 #include "afs.h"
 #include "server.h"
-#include <dirent.h> /* readdir() */
-#include <sys/mman.h>
-#include <sys/time.h>
 #include "net.h"
 #include "ipc.h"
 #include "list.h"
@@ -540,7 +537,7 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 static void com_select_callback(int fd, const struct osl_object *query)
 {
        struct para_buffer pb = {
-               .max_size = SHMMAX,
+               .max_size = shm_get_shmmax(),
                .private_data = &fd,
                .max_size_handler = pass_buffer_as_shm
        };
@@ -1151,7 +1148,7 @@ void afs_event(enum afs_events event, struct para_buffer *pb,
  *
  * This table does not honor events.
  */
-int images_event_handler(__a_unused enum afs_events event,
+__a_const int images_event_handler(__a_unused enum afs_events event,
        __a_unused  struct para_buffer *pb, __a_unused void *data)
 {
        return 1;
@@ -1166,7 +1163,7 @@ int images_event_handler(__a_unused enum afs_events event,
  *
  * This table does not honor events.
  */
-int lyrics_event_handler(__a_unused enum afs_events event,
+__a_const int lyrics_event_handler(__a_unused enum afs_events event,
        __a_unused struct para_buffer *pb, __a_unused void *data)
 {
        return 1;