[asterisk-commits] rmudgett: trunk r375662 - in /trunk: ./ channels/ main/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Nov  2 16:01:33 2012
New Revision: 375662

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375662
Log:
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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c
    trunk/main/ccss.c
    trunk/main/channel.c
    trunk/main/format_pref.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=375662&r1=375661&r2=375662
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Fri Nov  2 16:01:33 2012
@@ -2742,7 +2742,7 @@
 }
 #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;

Modified: trunk/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ccss.c?view=diff&rev=375662&r1=375661&r2=375662
==============================================================================
--- trunk/main/ccss.c (original)
+++ trunk/main/ccss.c Fri Nov  2 16:01:33 2012
@@ -1856,7 +1856,7 @@
  * 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,

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=375662&r1=375661&r2=375662
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Nov  2 16:01:33 2012
@@ -478,7 +478,7 @@
 }
 
 /*! \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 @@
 	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 @@
 	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 @@
 	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 @@
 	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,

Modified: trunk/main/format_pref.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/format_pref.c?view=diff&rev=375662&r1=375661&r2=375662
==============================================================================
--- trunk/main/format_pref.c (original)
+++ trunk/main/format_pref.c Fri Nov  2 16:01:33 2012
@@ -37,7 +37,7 @@
 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 @@
 	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;