kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 12:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Opaquify char * and char[] in ast_channel

Browse Source 
Review: https://reviewboard.asterisk.org/r/1733/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2012-02-13 17:27:06 +00:00
parent a955a4770f
commit 34c55e8e7c
64 changed files with 723 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/snmp/agent.c
View File

@@ -329,35 +329,35 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
}
break;
case ASTCHANAPP:
if (chan->appl) {
strncpy(string_ret, chan->appl, sizeof(string_ret));
if (ast_channel_appl(chan)) {
strncpy(string_ret, ast_channel_appl(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANDATA:
if (chan->data) {
strncpy(string_ret, chan->data, sizeof(string_ret));
if (ast_channel_data(chan)) {
strncpy(string_ret, ast_channel_data(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANCONTEXT:
strncpy(string_ret, chan->context, sizeof(string_ret));
strncpy(string_ret, ast_channel_context(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
break;
case ASTCHANMACROCONTEXT:
strncpy(string_ret, chan->macrocontext, sizeof(string_ret));
strncpy(string_ret, ast_channel_macrocontext(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
break;
case ASTCHANMACROEXTEN:
strncpy(string_ret, chan->macroexten, sizeof(string_ret));
strncpy(string_ret, ast_channel_macroexten(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
@@ -367,7 +367,7 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
ret = (u_char *)&long_ret;
break;
case ASTCHANEXTEN:
strncpy(string_ret, chan->exten, sizeof(string_ret));
strncpy(string_ret, ast_channel_exten(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;