summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addons/app_mysql.c2
-rw-r--r--apps/app_macro.c2
-rw-r--r--apps/app_mixmonitor.c2
-rw-r--r--apps/app_stack.c2
-rw-r--r--channels/chan_iax2.c2
-rw-r--r--funcs/func_curl.c2
-rw-r--r--funcs/func_global.c2
-rw-r--r--funcs/func_lock.c2
-rw-r--r--funcs/func_odbc.c2
-rw-r--r--main/ccss.c4
-rw-r--r--main/channel.c12
-rw-r--r--main/pbx.c2
-rw-r--r--res/res_odbc.c2
13 files changed, 19 insertions, 19 deletions
diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 5649166a7..9ee584e27 100644
--- a/addons/app_mysql.c
+++ b/addons/app_mysql.c
@@ -106,7 +106,7 @@ static int autoclear = 0;
static void mysql_ds_destroy(void *data);
static void mysql_ds_fixup(void *data, struct ast_channel *oldchan, struct ast_channel *newchan);
-static struct ast_datastore_info mysql_ds_info = {
+static const struct ast_datastore_info mysql_ds_info = {
.type = "APP_ADDON_SQL_MYSQL",
.destroy = mysql_ds_destroy,
.chan_fixup = mysql_ds_fixup,
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 8f10d119e..337091f23 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -164,7 +164,7 @@ static char *exit_app = "MacroExit";
static void macro_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan);
-static struct ast_datastore_info macro_ds_info = {
+static const struct ast_datastore_info macro_ds_info = {
.type = "MACRO",
.chan_fixup = macro_fixup,
};
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index b3c37f31e..7da3bea69 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -383,7 +383,7 @@ static void mixmonitor_ds_destroy(void *data)
ast_mutex_unlock(&mixmonitor_ds->lock);
}
-static struct ast_datastore_info mixmonitor_ds_info = {
+static const struct ast_datastore_info mixmonitor_ds_info = {
.type = "mixmonitor",
.destroy = mixmonitor_ds_destroy,
};
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 00a63480d..e32d56dd7 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -212,7 +212,7 @@ static const char app_pop[] = "StackPop";
static void gosub_free(void *data);
-static struct ast_datastore_info stack_info = {
+static const struct ast_datastore_info stack_info = {
.type = "GOSUB",
.destroy = gosub_free,
};
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index cc51624f2..199834ddf 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1380,7 +1380,7 @@ static void iax2_ami_channelupdate(struct chan_iax2_pvt *pvt)
pvt->callno, pvt->peercallno, pvt->peer ? pvt->peer : "");
}
-static struct ast_datastore_info iax2_variable_datastore_info = {
+static const struct ast_datastore_info iax2_variable_datastore_info = {
.type = "IAX2_VARIABLE",
.duplicate = iax2_dup_variable_datastore,
.destroy = iax2_free_variable_datastore,
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index a4328b923..2305d3719 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -174,7 +174,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
static void curlds_free(void *data);
-static struct ast_datastore_info curl_info = {
+static const struct ast_datastore_info curl_info = {
.type = "CURL",
.destroy = curlds_free,
};
diff --git a/funcs/func_global.c b/funcs/func_global.c
index de8de8a50..e16b60ac1 100644
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -88,7 +88,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
static void shared_variable_free(void *data);
-static struct ast_datastore_info shared_variable_info = {
+static const struct ast_datastore_info shared_variable_info = {
.type = "SHARED_VARIABLES",
.destroy = shared_variable_free,
};
diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 9394b3918..d8db10e84 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -99,7 +99,7 @@ static void lock_fixup(void *data, struct ast_channel *oldchan, struct ast_chann
static int unloading = 0;
static pthread_t broker_tid = AST_PTHREADT_NULL;
-static struct ast_datastore_info lock_info = {
+static const struct ast_datastore_info lock_info = {
.type = "MUTEX",
.destroy = lock_free,
.chan_fixup = lock_fixup,
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index 5b24878a6..d6a11cd1a 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -119,7 +119,7 @@ struct acf_odbc_query {
static void odbc_datastore_free(void *data);
-static struct ast_datastore_info odbc_info = {
+static const struct ast_datastore_info odbc_info = {
.type = "FUNC_ODBC",
.destroy = odbc_datastore_free,
};
diff --git a/main/ccss.c b/main/ccss.c
index 03c75d750..76b02dac6 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -1845,7 +1845,7 @@ static void *dialed_cc_interfaces_duplicate(void *data)
* more information regarding the actual structure of the tree, see
* the documentation provided in include/asterisk/ccss.h
*/
-static const struct ast_datastore_info dialed_cc_interfaces_info = {
+static const const struct ast_datastore_info dialed_cc_interfaces_info = {
.type = "Dial CC Interfaces",
.duplicate = dialed_cc_interfaces_duplicate,
.destroy = dialed_cc_interfaces_destroy,
@@ -3285,7 +3285,7 @@ static void cc_recall_ds_destroy(void *data)
ast_free(recall_data);
}
-static struct ast_datastore_info recall_ds_info = {
+static const struct ast_datastore_info recall_ds_info = {
.type = "cc_recall",
.duplicate = cc_recall_ds_duplicate,
.destroy = cc_recall_ds_destroy,
diff --git a/main/channel.c b/main/channel.c
index 9abd9e7e0..1cfb76702 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -473,7 +473,7 @@ static void ast_chan_trace_destroy_cb(void *data)
}
/*! \brief Datastore to put the linked list of ast_chan_trace and trace status */
-static const struct ast_datastore_info ast_chan_trace_datastore_info = {
+static const const struct ast_datastore_info ast_chan_trace_datastore_info = {
.type = "ChanTrace",
.destroy = ast_chan_trace_destroy_cb
};
@@ -2377,7 +2377,7 @@ static void ast_dummy_channel_destructor(void *obj)
ast_channel_internal_cleanup(chan);
}
-struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid)
+struct ast_datastore *ast_channel_datastore_alloc(const const struct ast_datastore_info *info, const char *uid)
{
return ast_datastore_alloc(info, uid);
}
@@ -2418,7 +2418,7 @@ int ast_channel_datastore_remove(struct ast_channel *chan, struct ast_datastore
return AST_LIST_REMOVE(ast_channel_datastores(chan), datastore, entry) ? 0 : -1;
}
-struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, const char *uid)
+struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const const struct ast_datastore_info *info, const char *uid)
{
struct ast_datastore *datastore = NULL;
@@ -4700,7 +4700,7 @@ static void plc_ds_destroy(void *data)
ast_free(plc);
}
-static struct ast_datastore_info plc_ds_info = {
+static const struct ast_datastore_info plc_ds_info = {
.type = "plc",
.destroy = plc_ds_destroy,
};
@@ -6247,7 +6247,7 @@ static void xfer_ds_destroy(void *data)
ast_free(ds);
}
-static const struct ast_datastore_info xfer_ds_info = {
+static const const struct ast_datastore_info xfer_ds_info = {
.type = "xfer_colp",
.destroy = xfer_ds_destroy,
};
@@ -10021,7 +10021,7 @@ static void channel_cc_params_destroy(void *data)
ast_cc_config_params_destroy(cc_params);
}
-static const struct ast_datastore_info cc_channel_datastore_info = {
+static const const struct ast_datastore_info cc_channel_datastore_info = {
.type = "Call Completion",
.duplicate = channel_cc_params_copy,
.destroy = channel_cc_params_destroy,
diff --git a/main/pbx.c b/main/pbx.c
index cbfbafa69..a1ed1b52d 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3437,7 +3437,7 @@ static void exception_store_free(void *data)
ast_free(exception);
}
-static struct ast_datastore_info exception_store_info = {
+static const struct ast_datastore_info exception_store_info = {
.type = "EXCEPTION",
.destroy = exception_store_free,
};
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 3afa088da..797f31ece 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -153,7 +153,7 @@ static void odbc_release_obj2(struct odbc_obj *obj, struct odbc_txn_frame *tx);
AST_THREADSTORAGE(errors_buf);
-static struct ast_datastore_info txn_info = {
+static const struct ast_datastore_info txn_info = {
.type = "ODBC_Transaction",
.destroy = odbc_txn_free,
};