Make all the remaining ops structure constants.

This excludes the mixer for now since it requires a change to the
public headers.

Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>

diff --git a/src/control/control_ext.c b/src/control/control_ext.c
index 28bd49d397b6bc1c86baa627a69772a40980ecab..a8675c13dc9db52608b1ff4e642cc8a8eb4c0fdc 100644 (file)
--- a/src/control/control_ext.c
+++ b/src/control/control_ext.c
@@ -402,7 +402,7 @@ static int snd_ctl_ext_poll_revents(snd_ctl_t *handle, struct pollfd *pfds, unsi
        return -EINVAL;
 }
 
-static snd_ctl_ops_t snd_ctl_ext_ops = {
+static const snd_ctl_ops_t snd_ctl_ext_ops = {
        .close = snd_ctl_ext_close,
        .nonblock = snd_ctl_ext_nonblock,
        .async = snd_ctl_ext_async,

diff --git a/src/hwdep/hwdep_hw.c b/src/hwdep/hwdep_hw.c
index 75dc7266445d063fcad5d7cd519a8b0d4a033fe2..238a507a8475fa422e5a5a924d6f5573bd445425 100644 (file)
--- a/src/hwdep/hwdep_hw.c
+++ b/src/hwdep/hwdep_hw.c
@@ -94,7 +94,7 @@ static ssize_t snd_hwdep_hw_read(snd_hwdep_t *hwdep, void *buffer, size_t size)
        return result;
 }
 
-static snd_hwdep_ops_t snd_hwdep_hw_ops = {
+static const snd_hwdep_ops_t snd_hwdep_hw_ops = {
        .close = snd_hwdep_hw_close,
        .nonblock = snd_hwdep_hw_nonblock,
        .info = snd_hwdep_hw_info,

diff --git a/src/hwdep/hwdep_local.h b/src/hwdep/hwdep_local.h
index d911f7a052c03038b118f0c0ab70d71af773d481..47467f9596602bd19a39b96e6c03f2f8ea3ad34f 100644 (file)
--- a/src/hwdep/hwdep_local.h
+++ b/src/hwdep/hwdep_local.h
@@ -39,7 +39,7 @@ struct _snd_hwdep {
        snd_hwdep_type_t type;
        int mode;
        int poll_fd;
-       snd_hwdep_ops_t *ops;
+       const snd_hwdep_ops_t *ops;
        void *private_data;
 };
 

diff --git a/src/input.c b/src/input.c
index 392eed23943b7a3d83176c595fd46f4f86e689b5..7cfbe56a4195b446fd2acac0fe2373733291fa0c 100644 (file)
--- a/src/input.c
+++ b/src/input.c
@@ -45,7 +45,7 @@ typedef struct _snd_input_ops {
 
 struct _snd_input {
        snd_input_type_t type;
-       snd_input_ops_t *ops;
+       const snd_input_ops_t *ops;
        void *private_data;
 };
 #endif
@@ -157,7 +157,7 @@ static int snd_input_stdio_ungetc(snd_input_t *input, int c)
        return ungetc(c, stdio->fp);
 }
 
-static snd_input_ops_t snd_input_stdio_ops = {
+static const snd_input_ops_t snd_input_stdio_ops = {
        .close          = snd_input_stdio_close,
        .scan           = snd_input_stdio_scan,
        .gets           = snd_input_stdio_gets,
@@ -283,7 +283,7 @@ static int snd_input_buffer_ungetc(snd_input_t *input, int c)
        return c;
 }
 
-static snd_input_ops_t snd_input_buffer_ops = {
+static const snd_input_ops_t snd_input_buffer_ops = {
        .close          = snd_input_buffer_close,
        .scan           = snd_input_buffer_scan,
        .gets           = snd_input_buffer_gets,

diff --git a/src/output.c b/src/output.c
index 1587297912c1d5480f63be6f2c473bdfcf3cd7f9..8a723f8b4c524e34ad0eef0d6777fae7a6779e38 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -44,7 +44,7 @@ typedef struct _snd_output_ops {
 
 struct _snd_output {
        snd_output_type_t type;
-       snd_output_ops_t *ops;
+       const snd_output_ops_t *ops;
        void *private_data;
 };
 #endif
@@ -165,7 +165,7 @@ static int snd_output_stdio_flush(snd_output_t *output)
        return fflush(stdio->fp);
 }
 
-static snd_output_ops_t snd_output_stdio_ops = {
+static const snd_output_ops_t snd_output_stdio_ops = {
        .close          = snd_output_stdio_close,
        .print          = snd_output_stdio_print,
        .puts           = snd_output_stdio_puts,
@@ -323,7 +323,7 @@ static int snd_output_buffer_flush(snd_output_t *output ATTRIBUTE_UNUSED)
        return 0;
 }
 
-static snd_output_ops_t snd_output_buffer_ops = {
+static const snd_output_ops_t snd_output_buffer_ops = {
        .close          = snd_output_buffer_close,
        .print          = snd_output_buffer_print,
        .puts           = snd_output_buffer_puts,

diff --git a/src/timer/timer_hw.c b/src/timer/timer_hw.c
index 5355705d274cfdfefdba99e426b45d875c11c981..34538584a1ff21f051bfd8de4367e8274c41c3d8 100644 (file)
--- a/src/timer/timer_hw.c
+++ b/src/timer/timer_hw.c
@@ -209,7 +209,7 @@ static ssize_t snd_timer_hw_read(snd_timer_t *handle, void *buffer, size_t size)
        return result;
 }
 
-static snd_timer_ops_t snd_timer_hw_ops = {
+static const snd_timer_ops_t snd_timer_hw_ops = {
        .close = snd_timer_hw_close,
        .nonblock = snd_timer_hw_nonblock,
        .async = snd_timer_hw_async,

diff --git a/src/timer/timer_local.h b/src/timer/timer_local.h
index 8f543fedc353c7828315c721e9d99b0027f502ce..19cadfe61a584ace6f5916ad5696e55c3c6cd0c7 100644 (file)
--- a/src/timer/timer_local.h
+++ b/src/timer/timer_local.h
@@ -45,7 +45,7 @@ struct _snd_timer {
        snd_timer_type_t type;
        int mode;
        int poll_fd;
-       snd_timer_ops_t *ops;
+       const snd_timer_ops_t *ops;
        void *private_data;
        struct list_head async_handlers;
 };

diff --git a/src/timer/timer_query_hw.c b/src/timer/timer_query_hw.c
index 743ee1fb9ff9317f6f8b90514081df67e0aacbd0..9f62b78aeb2e1348739298263c3cd6bc31f6ffbc 100644 (file)
--- a/src/timer/timer_query_hw.c
+++ b/src/timer/timer_query_hw.c
@@ -81,7 +81,7 @@ static int snd_timer_query_hw_status(snd_timer_query_t *handle, snd_timer_gstatu
        return 0;
 }
 
-static snd_timer_query_ops_t snd_timer_query_hw_ops = {
+static const snd_timer_query_ops_t snd_timer_query_hw_ops = {
        .close = snd_timer_query_hw_close,
        .next_device = snd_timer_query_hw_next_device,
        .info = snd_timer_query_hw_info,