Ensure that all ast_datastore_info structures are 'const'.

While addressing a bug, I came across a instance of 'struct ast_datastore_info'
that was not declared 'const'. Since the API already expects them to be
'const', this patch changes the declarations of all existing instances
that were not already declared that way.
........

Merged revisions 370183 from http://svn.asterisk.org/svn/asterisk/branches/1.8

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@370184 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 5649166a72b6b4aa07687b3f399ed2c7482eb20b..9ee584e27af53c49b2710d130c27781563540375 100644 (file)
--- 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 8a31dc221ac96869a9d8220c19c4f6fe867a7179..c22df3a89073dc0d4dec9e566a133d568d84d3b2 100644 (file)
--- 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 3d41fef455cecfbfd3a632bad0532ebce08d73b7..6422774c6a7404482d4d0b95ea714fd4e674bc0c 100644 (file)
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -281,7 +281,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 102e00472550edfb378680262404827e682b1ccc..b93acebc7824e21e69fd733bf3625b024acf2824 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -212,7 +212,7 @@ static const char * const 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 8cd425e0c7010aed069f4fc3969809b1331ee140..e1dd5972a57fee646160c25b992edf794d86ba0b 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1328,7 +1328,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 a4328b92392717d4fde67ad8edd125b353b8c355..2305d3719fc661cc0edc927395d0dfde2e09cbf0 100644 (file)
--- 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 201f075d478e3e89129bf88c89a51af5dd4c817f..8507b1d273fdf66c157b37a0a41e9384c1e95bfc 100644 (file)
--- 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 ef09ed02fb95291b9a6f5af4ea76043ad876e2a2..92d57768ffc041b1e0ea7ff41b14d8c10c9784c3 100644 (file)
--- 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 e2a6a62d5b61d5ba788fabd3b581cdf9fbf8f184..9625fcc62a154ba67643ada74c0505c0e4b9e7b3 100644 (file)
--- 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 d012550f917fc20140d7f82c84ac6f59ef3be37a..9efc280a95693e0ae725d2bfddf0a613e209a40f 100644 (file)
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -1822,7 +1822,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,
@@ -3251,7 +3251,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 00b2b7cdf265e1c358452b3591e83dc8ffb02930..e703b6dabd31ee665aa42b33c925590d90453b14 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -678,7 +678,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
 };
@@ -2548,7 +2548,7 @@ static void ast_dummy_channel_destructor(void *obj)
        ast_string_field_free_memory(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);
 }
@@ -2589,7 +2589,7 @@ int ast_channel_datastore_remove(struct ast_channel *chan, struct ast_datastore
        return AST_LIST_REMOVE(&chan->datastores, 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;
        
@@ -4782,7 +4782,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,
 };
@@ -6269,7 +6269,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,
 };
@@ -9713,7 +9713,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 5408b0ac3747931b30ce5f28c8b612e94c49aa9d..0750cde9c3ce255c97776b0b9f14bae0fa300995 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3418,7 +3418,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 014929e8733b26b9b7f1d7f4c354083a9afa290f..c4770c54522ed4400d72f287a644464755557e84 100644 (file)
--- 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,
 };