touch, rm, cpsi, init: Fix initialization of para_buffer.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index 8d32516d22f3c2526926eba5bdcb46717c5c662e..826fc28bb84c0f839958dbf3f2f5936728f03f6f 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -693,16 +693,13 @@ err:
 int load_afd(int shmid, struct audio_file_data *afd)
 {
        void *shm_afd;
-       char *buf;
        int ret;
 
        ret = shm_attach(shmid, ATTACH_RO, &shm_afd);
        if (ret < 0)
                return ret;
        *afd = *(struct audio_file_data *)shm_afd;
-       buf = shm_afd;
-       buf += sizeof(*afd);
-       load_chunk_table(&afd->afhi, buf);
+       load_chunk_table(&afd->afhi, shm_afd + sizeof(*afd));
        shm_detach(shm_afd);
        return 1;
 }
@@ -2113,7 +2110,10 @@ static void com_touch_callback(int fd, const struct osl_object *query)
        struct touch_action_data tad = {.cto = query->data,
                .pb = {
                        .max_size = shm_get_shmmax(),
-                       .private_data = &fd,
+                       .private_data = &(struct afs_max_size_handler_data) {
+                               .fd = fd,
+                               .band = SBD_OUTPUT
+                       },
                        .max_size_handler = afs_max_size_handler
                }
        };
@@ -2254,7 +2254,10 @@ static void com_rm_callback(int fd, const struct osl_object *query)
        struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
                .pb = {
                        .max_size = shm_get_shmmax(),
-                       .private_data = &fd,
+                       .private_data = &(struct afs_max_size_handler_data) {
+                               .fd = fd,
+                               .band = SBD_OUTPUT
+                       },
                        .max_size_handler = afs_max_size_handler
                }
        };
@@ -2396,7 +2399,10 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
                .flags = *(unsigned *)query->data,
                .pb = {
                        .max_size = shm_get_shmmax(),
-                       .private_data = &fd,
+                       .private_data = &(struct afs_max_size_handler_data) {
+                               .fd = fd,
+                               .band = SBD_OUTPUT
+                       },
                        .max_size_handler = afs_max_size_handler
                }
        };