kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 71289 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r71289 | tilghman | 2007-06-24 12:39:34 -0500 (Sun, 24 Jun 2007) | 10 lines

Merged revisions 71288 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r71288 | tilghman | 2007-06-24 12:32:21 -0500 (Sun, 24 Jun 2007) | 2 lines

Issue 10043 - There is a legitimate need to be able to set variables to the empty string.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-06-24 17:42:39 +00:00
parent 0296bd9957
commit d6c0627c4f
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/db.c
View File

@@ -538,12 +538,8 @@ static int manager_dbput(struct mansession *s, const struct message *m)
astman_send_error(s, m, "No key specified");
return 0;
}
if (ast_strlen_zero(val)) {
astman_send_error(s, m, "No val specified");
return 0;
}
res = ast_db_put(family, key, val);
res = ast_db_put(family, key, S_OR(val, ""));
if (res) {
astman_send_error(s, m, "Failed to update entry");
} else {

7
main/manager.c
View File

@@ -1554,11 +1554,6 @@ static int action_setvar(struct mansession *s, const struct message *m)
return 0;
}
if (ast_strlen_zero(varval)) {
astman_send_error(s, m, "No value specified");
return 0;
}
if (!ast_strlen_zero(name)) {
c = ast_get_channel_by_name_locked(name);
if (!c) {
@@ -1567,7 +1562,7 @@ static int action_setvar(struct mansession *s, const struct message *m)
}
}
pbx_builtin_setvar_helper(c, varname, varval);
pbx_builtin_setvar_helper(c, varname, S_OR(varval, ""));
if (c)
ast_channel_unlock(c);