mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 20:56:39 +00:00
Make groups be 64-bits (bug #3351, with mods)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -74,7 +74,7 @@ struct ast_dsp *dsp = NULL;
|
||||
static char outgoingmsn[AST_MAX_EXTENSION]="";
|
||||
|
||||
/* Default group */
|
||||
static unsigned int cur_group = 0;
|
||||
static ast_group_t cur_group = 0;
|
||||
|
||||
static int usecnt =0;
|
||||
|
||||
@@ -790,7 +790,7 @@ static struct ast_channel *modem_request(const char *type, int format, void *dat
|
||||
struct ast_modem_pvt *p;
|
||||
struct ast_channel *tmp = NULL;
|
||||
char dev[80];
|
||||
unsigned int group = 0;
|
||||
ast_group_t group = 0;
|
||||
char *stringp=NULL;
|
||||
strncpy(dev, (char *)data, sizeof(dev)-1);
|
||||
stringp=dev;
|
||||
@@ -848,11 +848,11 @@ static struct ast_channel *modem_request(const char *type, int format, void *dat
|
||||
return tmp;
|
||||
}
|
||||
|
||||
static unsigned int get_group(char *s)
|
||||
static ast_group_t get_group(char *s)
|
||||
{
|
||||
char *piece;
|
||||
int start, finish,x;
|
||||
unsigned int group = 0;
|
||||
ast_group_t group = 0;
|
||||
char *copy = ast_strdupa(s);
|
||||
char *stringp=NULL;
|
||||
if (!copy) {
|
||||
@@ -874,7 +874,7 @@ static unsigned int get_group(char *s)
|
||||
piece = strsep(&stringp, ",");
|
||||
|
||||
for (x=start;x<=finish;x++) {
|
||||
if ((x > 31) || (x < 0)) {
|
||||
if ((x > 63) || (x < 0)) {
|
||||
ast_log(LOG_WARNING, "Ignoring invalid group %d\n", x);
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user