From: Automerge script <automerge@asterisk.org>
Date: Fri, 2 Nov 2012 21:26:01 +0000 (+0000)
Subject: Merged revisions 375659 via svnmerge from
X-Git-Tag: 10.11.0-digiumphones-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9c13c10e9806666e9afa42406f106fa7d8262e9;p=thirdparty%2Fasterisk.git

Merged revisions 375659 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r375659 | rmudgett | 2012-11-02 15:53:53 -0500 (Fri, 02 Nov 2012) | 5 lines

  Things don't need to be that const.
  ........

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


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

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index de86f0b4ef..4679277cca 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2733,7 +2733,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 c6aeae132f..9c14fe1941 100644
--- 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 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 8684f6cc30..85c79c9b4f 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -683,7 +683,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
 };
@@ -2577,7 +2577,7 @@ static void ast_dummy_channel_destructor(void *obj)
 	ast_string_field_free_memory(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);
 }
@@ -2618,7 +2618,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 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;
 	
@@ -6315,7 +6315,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,
 };
@@ -9774,7 +9774,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;