From be467d0cea8004e61e3861a9f117c6fde3f6c4fc Mon Sep 17 00:00:00 2001 From: Russell Bryant <russell@russellbryant.com> Date: Thu, 30 Oct 2008 19:18:16 +0000 Subject: [PATCH] - spaces to tabs - add some braces - remove unnecessary cast git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@152875 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- funcs/func_db.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/funcs/func_db.c b/funcs/func_db.c index 1c15e5df87..374d4b859d 100644 --- a/funcs/func_db.c +++ b/funcs/func_db.c @@ -44,8 +44,8 @@ static int function_db_read(struct ast_channel *chan, const char *cmd, char *parse, char *buf, size_t len) { AST_DECLARE_APP_ARGS(args, - AST_APP_ARG(family); - AST_APP_ARG(key); + AST_APP_ARG(family); + AST_APP_ARG(key); ); buf[0] = '\0'; @@ -64,8 +64,9 @@ static int function_db_read(struct ast_channel *chan, const char *cmd, if (ast_db_get(args.family, args.key, buf, len - 1)) { ast_debug(1, "DB: %s/%s not found in database.\n", args.family, args.key); - } else + } else { pbx_builtin_setvar_helper(chan, "DB_RESULT", buf); + } return 0; } @@ -74,8 +75,8 @@ static int function_db_write(struct ast_channel *chan, const char *cmd, char *pa const char *value) { AST_DECLARE_APP_ARGS(args, - AST_APP_ARG(family); - AST_APP_ARG(key); + AST_APP_ARG(family); + AST_APP_ARG(key); ); if (ast_strlen_zero(parse)) { @@ -90,8 +91,9 @@ static int function_db_write(struct ast_channel *chan, const char *cmd, char *pa return -1; } - if (ast_db_put(args.family, args.key, (char *) value)) + if (ast_db_put(args.family, args.key, value)) { ast_log(LOG_WARNING, "DB: Error writing value to database.\n"); + } return 0; } @@ -114,8 +116,8 @@ static int function_db_exists(struct ast_channel *chan, const char *cmd, char *parse, char *buf, size_t len) { AST_DECLARE_APP_ARGS(args, - AST_APP_ARG(family); - AST_APP_ARG(key); + AST_APP_ARG(family); + AST_APP_ARG(key); ); buf[0] = '\0'; @@ -132,9 +134,9 @@ static int function_db_exists(struct ast_channel *chan, const char *cmd, return -1; } - if (ast_db_get(args.family, args.key, buf, len - 1)) + if (ast_db_get(args.family, args.key, buf, len - 1)) { strcpy(buf, "0"); - else { + } else { pbx_builtin_setvar_helper(chan, "DB_RESULT", buf); strcpy(buf, "1"); } @@ -158,8 +160,8 @@ static int function_db_delete(struct ast_channel *chan, const char *cmd, char *parse, char *buf, size_t len) { AST_DECLARE_APP_ARGS(args, - AST_APP_ARG(family); - AST_APP_ARG(key); + AST_APP_ARG(family); + AST_APP_ARG(key); ); buf[0] = '\0'; @@ -183,6 +185,7 @@ static int function_db_delete(struct ast_channel *chan, const char *cmd, ast_debug(1, "DB_DELETE: %s/%s could not be deleted from the database\n", args.family, args.key); } } + pbx_builtin_setvar_helper(chan, "DB_RESULT", buf); return 0; -- GitLab