mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-25 14:06:27 +00:00
use string fields for some stuff in ast_channel
const-ify some more APIs remove 'type' field from ast_channel, in favor of the one in the channel's tech structure allow string field module users to specify the 'chunk size' for pool allocations update chan_alsa to be compatible with recent const-ification patches git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -64,6 +64,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#include "asterisk/config.h"
|
||||
#include "asterisk/utils.h"
|
||||
#include "asterisk/cli.h"
|
||||
#include "asterisk/stringfields.h"
|
||||
|
||||
#define MAX_MOHFILES 512
|
||||
#define MAX_MOHFILE_LEN 128
|
||||
@@ -573,7 +574,7 @@ static int moh2_exec(struct ast_channel *chan, void *data)
|
||||
ast_log(LOG_WARNING, "SetMusicOnHold requires an argument (class)\n");
|
||||
return -1;
|
||||
}
|
||||
strncpy(chan->musicclass, data, sizeof(chan->musicclass) - 1);
|
||||
ast_string_field_set(chan, musicclass, data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -595,7 +596,7 @@ static int moh4_exec(struct ast_channel *chan, void *data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct mohclass *get_mohbyname(char *name)
|
||||
static struct mohclass *get_mohbyname(const char *name)
|
||||
{
|
||||
struct mohclass *moh;
|
||||
moh = mohclasses;
|
||||
@@ -862,7 +863,7 @@ static void local_ast_moh_cleanup(struct ast_channel *chan)
|
||||
}
|
||||
}
|
||||
|
||||
static int local_ast_moh_start(struct ast_channel *chan, char *class)
|
||||
static int local_ast_moh_start(struct ast_channel *chan, const char *class)
|
||||
{
|
||||
struct mohclass *mohclass;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user