[svn-commits] rizzo: trunk r48958 - in /trunk: apps/ channels/
contrib/utils/ funcs/ includ...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sun Dec 24 23:38:10 MST 2006
Author: rizzo
Date: Mon Dec 25 00:38:09 2006
New Revision: 48958
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48958
Log:
rename the structs struct tone_zone_sound and struct tone_zone
defined in indications.h to ind_tone_zone_sound and ind_tone_zone,
to avoid conflicts with the structs with the same names
defined in tonezone.h
Hope i haven't missed any instance.
Modified:
trunk/apps/app_disa.c
trunk/apps/app_read.c
trunk/channels/chan_misdn.c
trunk/contrib/utils/zones2indications.c
trunk/funcs/func_channel.c
trunk/include/asterisk/channel.h
trunk/include/asterisk/indications.h
trunk/main/app.c
trunk/main/channel.c
trunk/main/indications.c
trunk/res/res_indications.c
trunk/res/snmp/agent.c
Modified: trunk/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_disa.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/apps/app_disa.c (original)
+++ trunk/apps/app_disa.c Mon Dec 25 00:38:09 2006
@@ -99,7 +99,7 @@
static void play_dialtone(struct ast_channel *chan, char *mailbox)
{
- const struct tone_zone_sound *ts = NULL;
+ const struct ind_tone_zone_sound *ts = NULL;
if(ast_app_has_voicemail(mailbox, NULL))
ts = ast_get_indication_tone(chan->zone, "dialrecall");
else
Modified: trunk/apps/app_read.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_read.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/apps/app_read.c (original)
+++ trunk/apps/app_read.c Mon Dec 25 00:38:09 2006
@@ -93,7 +93,7 @@
int tries = 1, to = 0, x = 0;
double tosec;
char *argcopy = NULL;
- struct tone_zone_sound *ts;
+ struct ind_tone_zone_sound *ts;
struct ast_flags flags = {0};
AST_DECLARE_APP_ARGS(arglist,
Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Dec 25 00:38:09 2006
@@ -205,7 +205,7 @@
int other_pid;
struct chan_list *other_ch;
- const struct tone_zone_sound *ts;
+ const struct ind_tone_zone_sound *ts;
int overlap_dial;
int overlap_dial_task;
@@ -2775,7 +2775,7 @@
static int dialtone_indicate(struct chan_list *cl)
{
- const struct tone_zone_sound *ts= NULL;
+ const struct ind_tone_zone_sound *ts= NULL;
struct ast_channel *ast=cl->ast;
Modified: trunk/contrib/utils/zones2indications.c
URL: http://svn.digium.com/view/asterisk/trunk/contrib/utils/zones2indications.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/contrib/utils/zones2indications.c (original)
+++ trunk/contrib/utils/zones2indications.c Mon Dec 25 00:38:09 2006
@@ -27,7 +27,7 @@
#define PROGRAM "zones2indication"
-void print_tone_zone_sound(struct tone_zone *zone_data, const char* name,
+void print_tone_zone_sound(struct ind_tone_zone *zone_data, const char* name,
int toneid) {
int i;
for (i=0; i<ZT_TONE_MAX; i++) {
@@ -38,7 +38,7 @@
}
}
-void print_indications(struct tone_zone *zone_data) {
+void print_indications(struct ind_tone_zone *zone_data) {
int i;
printf (
Modified: trunk/funcs/func_channel.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_channel.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/funcs/func_channel.c (original)
+++ trunk/funcs/func_channel.c Mon Dec 25 00:38:09 2006
@@ -111,7 +111,7 @@
else if (!strcasecmp(data, "musicclass"))
locked_string_field_set(chan, musicclass, value);
else if (!strcasecmp(data, "tonezone")) {
- struct tone_zone *new_zone;
+ struct ind_tone_zone *new_zone;
if (!(new_zone = ast_get_indication_zone(value))) {
ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", value);
ret = -1;
Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Mon Dec 25 00:38:09 2006
@@ -442,7 +442,7 @@
struct ast_cdr *cdr; /*!< Call Detail Record */
enum ast_channel_adsicpe adsicpe; /*!< Whether or not ADSI is detected on CPE */
- struct tone_zone *zone; /*!< Tone zone as set in indications.conf or
+ struct ind_tone_zone *zone; /*!< Tone zone as set in indications.conf or
in the CHANNEL dialplan function */
struct ast_channel_monitor *monitor; /*!< Channel monitoring */
Modified: trunk/include/asterisk/indications.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/indications.h?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/include/asterisk/indications.h (original)
+++ trunk/include/asterisk/indications.h Mon Dec 25 00:38:09 2006
@@ -34,8 +34,8 @@
#include "asterisk/lock.h"
-struct tone_zone_sound {
- struct tone_zone_sound *next; /* next element */
+struct ind_tone_zone_sound {
+ struct ind_tone_zone_sound *next; /* next element */
const char *name; /* Identifing name */
const char *data; /* Actual zone description */
/* Description is a series of tones of the format:
@@ -45,33 +45,33 @@
specified in milliseconds */
};
-struct tone_zone {
- AST_RWLIST_ENTRY(tone_zone) list;
+struct ind_tone_zone {
+ AST_RWLIST_ENTRY(ind_tone_zone) list;
char country[5]; /* Country code */
char alias[5]; /* is this an alias? */
char description[40]; /* Description */
int nrringcadence; /* # registered ringcadence elements */
int *ringcadence; /* Ring cadence */
- struct tone_zone_sound *tones; /* The known tones for this zone */
+ struct ind_tone_zone_sound *tones; /* The known tones for this zone */
};
/* set the default tone country */
int ast_set_indication_country(const char *country);
/* locate tone_zone, given the country. if country == NULL, use the default country */
-struct tone_zone *ast_get_indication_zone(const char *country);
+struct ind_tone_zone *ast_get_indication_zone(const char *country);
/* locate a tone_zone_sound, given the tone_zone. if tone_zone == NULL, use the default tone_zone */
-struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, const char *indication);
+struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication);
/* add a new country, if country exists, it will be replaced. */
-int ast_register_indication_country(struct tone_zone *country);
+int ast_register_indication_country(struct ind_tone_zone *country);
/* remove an existing country and all its indications, country must exist */
int ast_unregister_indication_country(const char *country);
/* add a new indication to a tone_zone. tone_zone must exist. if the indication already
* exists, it will be replaced. */
-int ast_register_indication(struct tone_zone *zone, const char *indication, const char *tonelist);
+int ast_register_indication(struct ind_tone_zone *zone, const char *indication, const char *tonelist);
/* remove an existing tone_zone's indication. tone_zone must exist */
-int ast_unregister_indication(struct tone_zone *zone, const char *indication);
+int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication);
/* Start a tone-list going */
int ast_playtones_start(struct ast_channel *chan, int vol, const char* tonelist, int interruptible);
@@ -79,10 +79,10 @@
void ast_playtones_stop(struct ast_channel *chan);
/* support for walking through a list of indications */
-struct tone_zone *ast_walk_indications(const struct tone_zone *cur);
+struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur);
#if 0
-extern struct tone_zone *tone_zones;
+extern struct ind_tone_zone *tone_zones;
extern ast_mutex_t tzlock;
#endif
Modified: trunk/main/app.c
URL: http://svn.digium.com/view/asterisk/trunk/main/app.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Mon Dec 25 00:38:09 2006
@@ -62,7 +62,7 @@
*/
int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout)
{
- struct tone_zone_sound *ts;
+ struct ind_tone_zone_sound *ts;
int res=0, x=0;
if (maxlen > size)
Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Dec 25 00:38:09 2006
@@ -2301,7 +2301,7 @@
if (condition < 0)
ast_playtones_stop(chan);
else {
- const struct tone_zone_sound *ts = NULL;
+ const struct ind_tone_zone_sound *ts = NULL;
switch (condition) {
case AST_CONTROL_RINGING:
ts = ast_get_indication_tone(chan->zone, "ring");
Modified: trunk/main/indications.c
URL: http://svn.digium.com/view/asterisk/trunk/main/indications.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/main/indications.c (original)
+++ trunk/main/indications.c Mon Dec 25 00:38:09 2006
@@ -337,12 +337,12 @@
/*--------------------------------------------*/
-static AST_RWLIST_HEAD_STATIC(tone_zones, tone_zone);
-static struct tone_zone *current_tonezone;
-
-struct tone_zone *ast_walk_indications(const struct tone_zone *cur)
-{
- struct tone_zone *tz = NULL;
+static AST_RWLIST_HEAD_STATIC(tone_zones, ind_tone_zone);
+static struct ind_tone_zone *current_tonezone;
+
+struct ind_tone_zone *ast_walk_indications(const struct ind_tone_zone *cur)
+{
+ struct ind_tone_zone *tz = NULL;
AST_RWLIST_RDLOCK(&tone_zones);
/* If cur is not NULL, then we have to iterate through - otherwise just return the first entry */
@@ -363,7 +363,7 @@
/* Set global indication country */
int ast_set_indication_country(const char *country)
{
- struct tone_zone *zone = NULL;
+ struct ind_tone_zone *zone = NULL;
/* If no country is specified or we are unable to find the zone, then return not found */
if (!country || !(zone = ast_get_indication_zone(country)))
@@ -382,9 +382,9 @@
}
/* locate tone_zone, given the country. if country == NULL, use the default country */
-struct tone_zone *ast_get_indication_zone(const char *country)
-{
- struct tone_zone *tz = NULL;
+struct ind_tone_zone *ast_get_indication_zone(const char *country)
+{
+ struct ind_tone_zone *tz = NULL;
int alias_loop = 0;
AST_RWLIST_RDLOCK(&tone_zones);
@@ -418,9 +418,9 @@
}
/* locate a tone_zone_sound, given the tone_zone. if tone_zone == NULL, use the default tone_zone */
-struct tone_zone_sound *ast_get_indication_tone(const struct tone_zone *zone, const char *indication)
-{
- struct tone_zone_sound *ts = NULL;
+struct ind_tone_zone_sound *ast_get_indication_tone(const struct ind_tone_zone *zone, const char *indication)
+{
+ struct ind_tone_zone_sound *ts = NULL;
AST_RWLIST_RDLOCK(&tone_zones);
@@ -447,10 +447,10 @@
}
/* helper function to delete a tone_zone in its entirety */
-static inline void free_zone(struct tone_zone* zone)
+static inline void free_zone(struct ind_tone_zone* zone)
{
while (zone->tones) {
- struct tone_zone_sound *tmp = zone->tones->next;
+ struct ind_tone_zone_sound *tmp = zone->tones->next;
free((void*)zone->tones->name);
free((void*)zone->tones->data);
free(zone->tones);
@@ -466,9 +466,9 @@
/*--------------------------------------------*/
/* add a new country, if country exists, it will be replaced. */
-int ast_register_indication_country(struct tone_zone *zone)
-{
- struct tone_zone *tz = NULL;
+int ast_register_indication_country(struct ind_tone_zone *zone)
+{
+ struct ind_tone_zone *tz = NULL;
AST_RWLIST_WRLOCK(&tone_zones);
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&tone_zones, tz, list) {
@@ -502,7 +502,7 @@
* Also, all countries which are an alias for the specified country are removed. */
int ast_unregister_indication_country(const char *country)
{
- struct tone_zone *tz = NULL;
+ struct ind_tone_zone *tz = NULL;
int res = -1;
AST_RWLIST_WRLOCK(&tone_zones);
@@ -529,9 +529,9 @@
/* add a new indication to a tone_zone. tone_zone must exist. if the indication already
* exists, it will be replaced. */
-int ast_register_indication(struct tone_zone *zone, const char *indication, const char *tonelist)
-{
- struct tone_zone_sound *ts, *ps;
+int ast_register_indication(struct ind_tone_zone *zone, const char *indication, const char *tonelist)
+{
+ struct ind_tone_zone_sound *ts, *ps;
/* is it an alias? stop */
if (zone->alias[0])
@@ -567,9 +567,9 @@
}
/* remove an existing country's indication. Both country and indication must exist */
-int ast_unregister_indication(struct tone_zone *zone, const char *indication)
-{
- struct tone_zone_sound *ts,*ps = NULL, *tmp;
+int ast_unregister_indication(struct ind_tone_zone *zone, const char *indication)
+{
+ struct ind_tone_zone_sound *ts,*ps = NULL, *tmp;
int res = -1;
/* is it an alias? stop */
Modified: trunk/res/res_indications.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_indications.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/res/res_indications.c (original)
+++ trunk/res/res_indications.c Mon Dec 25 00:38:09 2006
@@ -85,7 +85,7 @@
*/
static int handle_add_indication(int fd, int argc, char *argv[])
{
- struct tone_zone *tz;
+ struct ind_tone_zone *tz;
int created_country = 0;
if (argc != 5) return RESULT_SHOWUSAGE;
@@ -119,7 +119,7 @@
*/
static int handle_remove_indication(int fd, int argc, char *argv[])
{
- struct tone_zone *tz;
+ struct ind_tone_zone *tz;
if (argc != 3 && argc != 4) return RESULT_SHOWUSAGE;
if (argc == 3) {
@@ -148,7 +148,7 @@
*/
static int handle_show_indications(int fd, int argc, char *argv[])
{
- struct tone_zone *tz = NULL;
+ struct ind_tone_zone *tz = NULL;
char buf[256];
int found_country = 0;
@@ -166,7 +166,7 @@
for (i=2; i<argc; i++) {
if (strcasecmp(tz->country,argv[i])==0 &&
!tz->alias[0]) {
- struct tone_zone_sound* ts;
+ struct ind_tone_zone_sound* ts;
if (!found_country) {
found_country = 1;
ast_cli(fd,"Country Indication PlayList\n"
@@ -196,7 +196,7 @@
*/
static int handle_playtones(struct ast_channel *chan, void *data)
{
- struct tone_zone_sound *ts;
+ struct ind_tone_zone_sound *ts;
int res;
if (!data || !((char*)data)[0]) {
@@ -231,7 +231,7 @@
struct ast_variable *v;
char *cxt;
char *c;
- struct tone_zone *tones;
+ struct ind_tone_zone *tones;
const char *country = NULL;
/* that the following cast is needed, is yuk! */
@@ -284,7 +284,7 @@
c = countries;
country = strsep(&c,",");
while (country) {
- struct tone_zone* azone;
+ struct ind_tone_zone* azone;
if (!(azone = ast_calloc(1, sizeof(*azone)))) {
ast_config_destroy(cfg);
return -1;
@@ -300,7 +300,7 @@
}
} else {
/* add tone to country */
- struct tone_zone_sound *ps,*ts;
+ struct ind_tone_zone_sound *ps,*ts;
for (ps=NULL,ts=tones->tones; ts; ps=ts, ts=ts->next) {
if (strcasecmp(v->name,ts->name)==0) {
/* already there */
Modified: trunk/res/snmp/agent.c
URL: http://svn.digium.com/view/asterisk/trunk/res/snmp/agent.c?view=diff&rev=48958&r1=48957&r2=48958
==============================================================================
--- trunk/res/snmp/agent.c (original)
+++ trunk/res/snmp/agent.c Mon Dec 25 00:38:09 2006
@@ -622,7 +622,7 @@
int exact, size_t *var_len, WriteMethod **write_method)
{
static unsigned long long_ret;
- struct tone_zone *tz = NULL;
+ struct ind_tone_zone *tz = NULL;
if (header_generic(vp, name, length, exact, var_len, write_method))
return NULL;
@@ -652,7 +652,7 @@
int exact, size_t *var_len, WriteMethod **write_method)
{
static unsigned long long_ret;
- struct tone_zone *tz = NULL;
+ struct ind_tone_zone *tz = NULL;
int i;
if (header_simple_table(vp, name, length, exact, var_len, write_method, -1))
More information about the svn-commits
mailing list