From: Richard Mudgett Date: Fri, 2 Nov 2012 20:48:03 +0000 (+0000) Subject: Things don't need to be that const. X-Git-Tag: 1.8.19.0-tc1~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6799706b15f6d16df8619754e6bbab0c9ec4e6ba;p=thirdparty%2Fasterisk.git Things don't need to be that const. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@375658 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index f2a6076779..6379d736fb 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2731,7 +2731,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 563eef2365..9d1a8bf564 100644 --- a/main/ccss.c +++ b/main/ccss.c @@ -1716,7 +1716,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 661b601211..5e584027e4 100644 --- a/main/channel.c +++ b/main/channel.c @@ -684,7 +684,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 }; @@ -2549,7 +2549,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); } @@ -2590,7 +2590,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; @@ -6097,7 +6097,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, }; @@ -9552,7 +9552,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,