Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

don't use prefixed structure names for internal structures

Browse Source 
don't use a plural structure name for a singular object


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@34274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2
Kevin P. Fleming 19 years ago
parent 2159afd1ae
commit d00c50cd14
1 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File

100
apps/app_queue.c
Unescape View File

@ -272,7 +272,7 @@ LOCAL_USER_DECL;
struct queue_ent { struct queue_ent {
struct ast_call_queue *parent; /*!< What queue is our parent */ struct call_queue *parent; /*!< What queue is our parent */
char moh[80]; /*!< Name of musiconhold to be used */ char moh[80]; /*!< Name of musiconhold to be used */
char announce[80]; /*!< Announcement to play for member when call is answered */ char announce[80]; /*!< Announcement to play for member when call is answered */
char context[AST_MAX_CONTEXT]; /*!< Context when user exits queue */ char context[AST_MAX_CONTEXT]; /*!< Context when user exits queue */
@ -303,20 +303,20 @@ struct member {
struct member *next; /*!< Next member */ struct member *next; /*!< Next member */
}; };
struct ast_member_interfaces { struct member_interface {
char interface[80]; char interface[80];
AST_LIST_ENTRY(ast_member_interfaces) list; /*!< Next call queue */ AST_LIST_ENTRY(member_interface) list; /*!< Next call queue */
}; };
static AST_LIST_HEAD_STATIC(interfaces, ast_member_interfaces); static AST_LIST_HEAD_STATIC(interfaces, member_interface);
/* values used in multi-bit flags in ast_call_queue */ /* values used in multi-bit flags in call_queue */
#define QUEUE_EMPTY_NORMAL 1 #define QUEUE_EMPTY_NORMAL 1
#define QUEUE_EMPTY_STRICT 2 #define QUEUE_EMPTY_STRICT 2
#define ANNOUNCEHOLDTIME_ALWAYS 1 #define ANNOUNCEHOLDTIME_ALWAYS 1
#define ANNOUNCEHOLDTIME_ONCE 2 #define ANNOUNCEHOLDTIME_ONCE 2
struct ast_call_queue { struct call_queue {
ast_mutex_t lock; ast_mutex_t lock;
char name[80]; /*!< Name */ char name[80]; /*!< Name */
char moh[80]; /*!< Music On Hold class to be used */ char moh[80]; /*!< Music On Hold class to be used */
@ -368,10 +368,10 @@ struct ast_call_queue {
struct member *members; /*!< Head of the list of members */ struct member *members; /*!< Head of the list of members */
struct queue_ent *head; /*!< Head of the list of callers */ struct queue_ent *head; /*!< Head of the list of callers */
struct ast_call_queue *next; /*!< Next call queue */ struct call_queue *next; /*!< Next call queue */
}; };
static struct ast_call_queue *queues = NULL; static struct call_queue *queues = NULL;
AST_MUTEX_DEFINE_STATIC(qlock); AST_MUTEX_DEFINE_STATIC(qlock);
static void set_queue_result(struct ast_channel *chan, enum queue_result res) static void set_queue_result(struct ast_channel *chan, enum queue_result res)
@ -407,7 +407,7 @@ static int strat2int(const char *strategy)
} }
/*! \brief Insert the 'new' entry after the 'prev' entry of queue 'q' */ /*! \brief Insert the 'new' entry after the 'prev' entry of queue 'q' */
static inline void insert_entry(struct ast_call_queue *q, struct queue_ent *prev, struct queue_ent *new, int *pos) static inline void insert_entry(struct call_queue *q, struct queue_ent *prev, struct queue_ent *new, int *pos)
{ {
struct queue_ent *cur; struct queue_ent *cur;
@ -432,7 +432,7 @@ enum queue_member_status {
QUEUE_NORMAL QUEUE_NORMAL
}; };
static enum queue_member_status get_member_status(const struct ast_call_queue *q) static enum queue_member_status get_member_status(const struct call_queue *q)
{ {
struct member *member; struct member *member;
enum queue_member_status result = QUEUE_NO_MEMBERS; enum queue_member_status result = QUEUE_NO_MEMBERS;
@ -462,10 +462,10 @@ struct statechange {
static void *changethread(void *data) static void *changethread(void *data)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct statechange *sc = data; struct statechange *sc = data;
struct member *cur; struct member *cur;
struct ast_member_interfaces *curint; struct member_interface *curint;
char *loc; char *loc;
char *technology; char *technology;
@ -570,9 +570,9 @@ static struct member *create_queue_member(char *interface, int penalty, int paus
return cur; return cur;
} }
static struct ast_call_queue *alloc_queue(const char *queuename) static struct call_queue *alloc_queue(const char *queuename)
{ {
struct ast_call_queue *q; struct call_queue *q;
q = malloc(sizeof(*q)); q = malloc(sizeof(*q));
if (q) { if (q) {
@ -583,7 +583,7 @@ static struct ast_call_queue *alloc_queue(const char *queuename)
return q; return q;
} }
static void init_queue(struct ast_call_queue *q) static void init_queue(struct call_queue *q)
{ {
q->dead = 0; q->dead = 0;
q->retry = DEFAULT_RETRY; q->retry = DEFAULT_RETRY;
@ -610,7 +610,7 @@ static void init_queue(struct ast_call_queue *q)
ast_copy_string(q->sound_periodicannounce, "queue-periodic-announce", sizeof(q->sound_periodicannounce)); ast_copy_string(q->sound_periodicannounce, "queue-periodic-announce", sizeof(q->sound_periodicannounce));
} }
static void clear_queue(struct ast_call_queue *q) static void clear_queue(struct call_queue *q)
{ {
q->holdtime = 0; q->holdtime = 0;
q->callscompleted = 0; q->callscompleted = 0;
@ -621,7 +621,7 @@ static void clear_queue(struct ast_call_queue *q)
static int add_to_interfaces(char *interface) static int add_to_interfaces(char *interface)
{ {
struct ast_member_interfaces *curint; struct member_interface *curint;
if (!interface) if (!interface)
return 0; return 0;
@ -652,7 +652,7 @@ static int add_to_interfaces(char *interface)
static int interface_exists_global(char *interface) static int interface_exists_global(char *interface)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct member *mem; struct member *mem;
int ret = 0; int ret = 0;
@ -675,7 +675,7 @@ static int interface_exists_global(char *interface)
static int remove_from_interfaces(char *interface) static int remove_from_interfaces(char *interface)
{ {
struct ast_member_interfaces *curint; struct member_interface *curint;
if (!interface) if (!interface)
return 0; return 0;
@ -700,7 +700,7 @@ static int remove_from_interfaces(char *interface)
static void clear_and_free_interfaces(void) static void clear_and_free_interfaces(void)
{ {
struct ast_member_interfaces *curint; struct member_interface *curint;
AST_LIST_LOCK(&interfaces); AST_LIST_LOCK(&interfaces);
while ((curint = AST_LIST_REMOVE_HEAD(&interfaces, list))) while ((curint = AST_LIST_REMOVE_HEAD(&interfaces, list)))
@ -715,7 +715,7 @@ static void clear_and_free_interfaces(void)
The failunknown flag is set for config files (and static realtime) to show The failunknown flag is set for config files (and static realtime) to show
errors for unknown parameters. It is cleared for dynamic realtime to allow errors for unknown parameters. It is cleared for dynamic realtime to allow
extra fields in the tables. */ extra fields in the tables. */
static void queue_set_param(struct ast_call_queue *q, const char *param, const char *val, int linenum, int failunknown) static void queue_set_param(struct call_queue *q, const char *param, const char *val, int linenum, int failunknown)
{ {
if (!strcasecmp(param, "music") || !strcasecmp(param, "musiconhold")) { if (!strcasecmp(param, "music") || !strcasecmp(param, "musiconhold")) {
ast_copy_string(q->moh, val, sizeof(q->moh)); ast_copy_string(q->moh, val, sizeof(q->moh));
@ -834,7 +834,7 @@ static void queue_set_param(struct ast_call_queue *q, const char *param, const c
} }
} }
static void rt_handle_member_record(struct ast_call_queue *q, char *interface, const char *penalty_str) static void rt_handle_member_record(struct call_queue *q, char *interface, const char *penalty_str)
{ {
struct member *m, *prev_m; struct member *m, *prev_m;
int penalty = 0; int penalty = 0;
@ -871,7 +871,7 @@ static void rt_handle_member_record(struct ast_call_queue *q, char *interface, c
} }
} }
static void free_members(struct ast_call_queue *q, int all) static void free_members(struct call_queue *q, int all)
{ {
/* Free non-dynamic members */ /* Free non-dynamic members */
struct member *curm, *next, *prev = NULL; struct member *curm, *next, *prev = NULL;
@ -890,16 +890,16 @@ static void free_members(struct ast_call_queue *q, int all)
} }
} }
static void destroy_queue(struct ast_call_queue *q) static void destroy_queue(struct call_queue *q)
{ {
free_members(q, 1); free_members(q, 1);
ast_mutex_destroy(&q->lock); ast_mutex_destroy(&q->lock);
free(q); free(q);
} }
static void remove_queue(struct ast_call_queue *q) static void remove_queue(struct call_queue *q)
{ {
struct ast_call_queue *cur, *prev = NULL; struct call_queue *cur, *prev = NULL;
ast_mutex_lock(&qlock); ast_mutex_lock(&qlock);
for (cur = queues; cur; cur = cur->next) { for (cur = queues; cur; cur = cur->next) {
@ -918,10 +918,10 @@ static void remove_queue(struct ast_call_queue *q)
/*!\brief Reload a single queue via realtime. /*!\brief Reload a single queue via realtime.
\return Return the queue, or NULL if it doesn't exist. \return Return the queue, or NULL if it doesn't exist.
\note Should be called with the global qlock locked. */ \note Should be called with the global qlock locked. */
static struct ast_call_queue *find_queue_by_name_rt(const char *queuename, struct ast_variable *queue_vars, struct ast_config *member_config) static struct call_queue *find_queue_by_name_rt(const char *queuename, struct ast_variable *queue_vars, struct ast_config *member_config)
{ {
struct ast_variable *v; struct ast_variable *v;
struct ast_call_queue *q, *prev_q = NULL; struct call_queue *q, *prev_q = NULL;
struct member *m, *prev_m, *next_m; struct member *m, *prev_m, *next_m;
char *interface; char *interface;
char *tmp, *tmp_name; char *tmp, *tmp_name;
@ -1044,11 +1044,11 @@ static struct ast_call_queue *find_queue_by_name_rt(const char *queuename, struc
return q; return q;
} }
static struct ast_call_queue *load_realtime_queue(char *queuename) static struct call_queue *load_realtime_queue(char *queuename)
{ {
struct ast_variable *queue_vars = NULL; struct ast_variable *queue_vars = NULL;
struct ast_config *member_config = NULL; struct ast_config *member_config = NULL;
struct ast_call_queue *q; struct call_queue *q;
/* Find the queue in the in-core list first. */ /* Find the queue in the in-core list first. */
ast_mutex_lock(&qlock); ast_mutex_lock(&qlock);
@ -1093,7 +1093,7 @@ static struct ast_call_queue *load_realtime_queue(char *queuename)
static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result *reason) static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result *reason)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct queue_ent *cur, *prev = NULL; struct queue_ent *cur, *prev = NULL;
int res = -1; int res = -1;
int pos = 0; int pos = 0;
@ -1332,7 +1332,7 @@ static void recalc_holdtime(struct queue_ent *qe)
static void leave_queue(struct queue_ent *qe) static void leave_queue(struct queue_ent *qe)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct queue_ent *cur, *prev = NULL; struct queue_ent *cur, *prev = NULL;
int pos = 0; int pos = 0;
@ -1389,7 +1389,7 @@ static void hangupcalls(struct localuser *outgoing, struct ast_channel *exceptio
} }
} }
static int update_status(struct ast_call_queue *q, struct member *member, int status) static int update_status(struct call_queue *q, struct member *member, int status)
{ {
struct member *cur; struct member *cur;
@ -1421,7 +1421,7 @@ static int update_status(struct ast_call_queue *q, struct member *member, int st
return 0; return 0;
} }
static int update_dial_status(struct ast_call_queue *q, struct member *member, int status) static int update_dial_status(struct call_queue *q, struct member *member, int status)
{ {
if (status == AST_CAUSE_BUSY) if (status == AST_CAUSE_BUSY)
status = AST_DEVICE_BUSY; status = AST_DEVICE_BUSY;
@ -1436,9 +1436,9 @@ static int update_dial_status(struct ast_call_queue *q, struct member *member, i
/* traverse all defined queues which have calls waiting and contain this member /* traverse all defined queues which have calls waiting and contain this member
return 0 if no other queue has precedence (higher weight) or 1 if found */ return 0 if no other queue has precedence (higher weight) or 1 if found */
static int compare_weight(struct ast_call_queue *rq, struct member *member) static int compare_weight(struct call_queue *rq, struct member *member)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct member *mem; struct member *mem;
int found = 0; int found = 0;
@ -2055,7 +2055,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
return res; return res;
} }
static int update_queue(struct ast_call_queue *q, struct member *member) static int update_queue(struct call_queue *q, struct member *member)
{ {
struct member *cur; struct member *cur;
@ -2076,7 +2076,7 @@ static int update_queue(struct ast_call_queue *q, struct member *member)
return 0; return 0;
} }
static int calc_metric(struct ast_call_queue *q, struct member *mem, int pos, struct queue_ent *qe, struct localuser *tmp) static int calc_metric(struct call_queue *q, struct member *mem, int pos, struct queue_ent *qe, struct localuser *tmp)
{ {
switch (q->strategy) { switch (q->strategy) {
case QUEUE_STRATEGY_RINGALL: case QUEUE_STRATEGY_RINGALL:
@ -2443,7 +2443,7 @@ static int wait_a_bit(struct queue_ent *qe)
return ast_waitfordigit(qe->chan, retrywait); return ast_waitfordigit(qe->chan, retrywait);
} }
static struct member * interface_exists(struct ast_call_queue *q, char *interface) static struct member *interface_exists(struct call_queue *q, char *interface)
{ {
struct member *mem; struct member *mem;
@ -2461,7 +2461,7 @@ static struct member * interface_exists(struct ast_call_queue *q, char *interfac
* <pm_family>/<queuename> = <interface>;<penalty>;<paused>[|...] * <pm_family>/<queuename> = <interface>;<penalty>;<paused>[|...]
* *
*/ */
static void dump_queue_members(struct ast_call_queue *pm_queue) static void dump_queue_members(struct call_queue *pm_queue)
{ {
struct member *cur_member; struct member *cur_member;
char value[PM_MAX_LEN]; char value[PM_MAX_LEN];
@ -2497,7 +2497,7 @@ static void dump_queue_members(struct ast_call_queue *pm_queue)
static int remove_from_queue(char *queuename, char *interface) static int remove_from_queue(char *queuename, char *interface)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct member *last_member, *look; struct member *last_member, *look;
int res = RES_NOSUCHQUEUE; int res = RES_NOSUCHQUEUE;
@ -2544,7 +2544,7 @@ static int remove_from_queue(char *queuename, char *interface)
static int add_to_queue(char *queuename, char *interface, int penalty, int paused, int dump) static int add_to_queue(char *queuename, char *interface, int penalty, int paused, int dump)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct member *new_member; struct member *new_member;
int res = RES_NOSUCHQUEUE; int res = RES_NOSUCHQUEUE;
@ -2597,7 +2597,7 @@ static int add_to_queue(char *queuename, char *interface, int penalty, int pause
static int set_member_paused(char *queuename, char *interface, int paused) static int set_member_paused(char *queuename, char *interface, int paused)
{ {
int found = 0; int found = 0;
struct ast_call_queue *q; struct call_queue *q;
struct member *mem; struct member *mem;
/* Special event for when all queues are paused - individual events still generated */ /* Special event for when all queues are paused - individual events still generated */
@ -2650,7 +2650,7 @@ static void reload_queue_members(void)
int paused = 0; int paused = 0;
struct ast_db_entry *db_tree; struct ast_db_entry *db_tree;
struct ast_db_entry *entry; struct ast_db_entry *entry;
struct ast_call_queue *cur_queue; struct call_queue *cur_queue;
char queue_data[PM_MAX_LEN]; char queue_data[PM_MAX_LEN];
ast_mutex_lock(&qlock); ast_mutex_lock(&qlock);
@ -3230,7 +3230,7 @@ check_turns:
static char *queue_function_qac(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) static char *queue_function_qac(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len)
{ {
int count = 0; int count = 0;
struct ast_call_queue *q; struct call_queue *q;
struct localuser *u; struct localuser *u;
struct member *m; struct member *m;
@ -3280,7 +3280,7 @@ static struct ast_custom_function queueagentcount_function = {
static void reload_queues(void) static void reload_queues(void)
{ {
struct ast_call_queue *q, *ql, *qn; struct call_queue *q, *ql, *qn;
struct ast_config *cfg; struct ast_config *cfg;
char *cat, *tmp; char *cat, *tmp;
struct ast_variable *var; struct ast_variable *var;
@ -3436,7 +3436,7 @@ static void reload_queues(void)
static int __queues_show(int manager, int fd, int argc, char **argv, int queue_show) static int __queues_show(int manager, int fd, int argc, char **argv, int queue_show)
{ {
struct ast_call_queue *q; struct call_queue *q;
struct queue_ent *qe; struct queue_ent *qe;
struct member *mem; struct member *mem;
int pos; int pos;
@ -3543,7 +3543,7 @@ static int queue_show(int fd, int argc, char **argv)
static char *complete_queue(char *line, char *word, int pos, int state) static char *complete_queue(char *line, char *word, int pos, int state)
{ {
struct ast_call_queue *q; struct call_queue *q;
int which=0; int which=0;
ast_mutex_lock(&qlock); ast_mutex_lock(&qlock);
@ -3578,7 +3578,7 @@ static int manager_queues_status( struct mansession *s, struct message *m )
char *queuefilter = astman_get_header(m,"Queue"); char *queuefilter = astman_get_header(m,"Queue");
char *memberfilter = astman_get_header(m,"Member"); char *memberfilter = astman_get_header(m,"Member");
char idText[256] = ""; char idText[256] = "";
struct ast_call_queue *q; struct call_queue *q;
struct queue_ent *qe; struct queue_ent *qe;
float sl = 0; float sl = 0;
struct member *mem; struct member *mem;
@ -3881,7 +3881,7 @@ static int handle_remove_queue_member(int fd, int argc, char *argv[])
static char *complete_remove_queue_member(char *line, char *word, int pos, int state) static char *complete_remove_queue_member(char *line, char *word, int pos, int state)
{ {
int which = 0; int which = 0;
struct ast_call_queue *q; struct call_queue *q;
struct member *m; struct member *m;
/* 0 - add; 1 - queue; 2 - member; 3 - <member>; 4 - to; 5 - <queue> */ /* 0 - add; 1 - queue; 2 - member; 3 - <member>; 4 - to; 5 - <queue> */

Write Preview
Loading…
Cancel
Save