From 2e702c85eb9847ac193f7bbf80069db45fd5707c Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Sun, 24 Jun 2007 17:39:34 +0000 Subject: [PATCH] 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/branches/1.4@71289 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/db.c | 6 +----- main/manager.c | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/main/db.c b/main/db.c index b25cd3cf62..f4eafc87fc 100644 --- a/main/db.c +++ b/main/db.c @@ -534,12 +534,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, (char *) val); + res = ast_db_put(family, key, (char *) S_OR(val, "")); if (res) { astman_send_error(s, m, "Failed to update entry"); } else { diff --git a/main/manager.c b/main/manager.c index 2b6fbf796e..be77dfc941 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1372,11 +1372,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) { @@ -1385,7 +1380,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);