From f85db0e34d9e919c98cec82458efa93626061277 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 2 Nov 2012 21:01:33 +0000
Subject: [PATCH] Things don't need to be that const. ........
Merged revisions 375658 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375659 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375661 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_misdn.c | 2 +-
main/ccss.c | 2 +-
main/channel.c | 10 +++++-----
main/format_pref.c | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index e605108207..af632f077e 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2742,7 +2742,7 @@ static void print_facility_IntResult(unsigned Level, const struct FacForwardingR
}
#endif /* defined(AST_MISDN_ENHANCEMENTS) */
-static void print_facility(const struct FacParm *fac, const const struct misdn_bchannel *bc)
+static void print_facility(const struct FacParm *fac, const struct misdn_bchannel *bc)
{
#if defined(AST_MISDN_ENHANCEMENTS)
unsigned Index;
diff --git a/main/ccss.c b/main/ccss.c
index d6b10b2614..11e3a008fe 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -1856,7 +1856,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 const struct ast_datastore_info dialed_cc_interfaces_info = {
+static const struct ast_datastore_info dialed_cc_interfaces_info = {
.type = "Dial CC Interfaces",
.duplicate = dialed_cc_interfaces_duplicate,
.destroy = dialed_cc_interfaces_destroy,
diff --git a/main/channel.c b/main/channel.c
index b0761e185b..861dbf0e23 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -478,7 +478,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 const struct ast_datastore_info ast_chan_trace_datastore_info = {
+static const struct ast_datastore_info ast_chan_trace_datastore_info = {
.type = "ChanTrace",
.destroy = ast_chan_trace_destroy_cb
};
@@ -2522,7 +2522,7 @@ static void ast_dummy_channel_destructor(void *obj)
ast_channel_internal_cleanup(chan);
}
-struct ast_datastore *ast_channel_datastore_alloc(const const struct ast_datastore_info *info, const char *uid)
+struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid)
{
return ast_datastore_alloc(info, uid);
}
@@ -2563,7 +2563,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 const struct ast_datastore_info *info, const char *uid)
+struct ast_datastore *ast_channel_datastore_find(struct ast_channel *chan, const struct ast_datastore_info *info, const char *uid)
{
struct ast_datastore *datastore = NULL;
@@ -6417,7 +6417,7 @@ static void xfer_ds_destroy(void *data)
ast_free(ds);
}
-static const const struct ast_datastore_info xfer_ds_info = {
+static const struct ast_datastore_info xfer_ds_info = {
.type = "xfer_colp",
.destroy = xfer_ds_destroy,
};
@@ -11039,7 +11039,7 @@ static void channel_cc_params_destroy(void *data)
ast_cc_config_params_destroy(cc_params);
}
-static const const struct ast_datastore_info cc_channel_datastore_info = {
+static 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/format_pref.c b/main/format_pref.c
index 8b495ba567..4ab607e167 100644
--- a/main/format_pref.c
+++ b/main/format_pref.c
@@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
void ast_codec_pref_convert(struct ast_codec_pref *pref, char *buf, size_t size, int right)
{
size_t f_len;
- const const struct ast_format_list *f_list = ast_format_list_get(&f_len);
+ const struct ast_format_list *f_list = ast_format_list_get(&f_len);
int x, differential = (int) 'A', mem;
char *from, *to;
@@ -120,7 +120,7 @@ void ast_codec_pref_remove(struct ast_codec_pref *pref, struct ast_format *forma
struct ast_codec_pref oldorder;
int x, y = 0;
size_t f_len = 0;
- const const struct ast_format_list *f_list;
+ const struct ast_format_list *f_list;
if (!pref->order[0]) {
return;
--
GitLab