From ad4795173980fae4392564fcb533fb6b9d3df437 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Fri, 31 Mar 2006 09:50:54 +0000
Subject: [PATCH] minor code simplifications - no need to use temporary
variables.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
pbx/pbx_loopback.c | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index ffa006527f..5f590cf8ac 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -90,18 +90,14 @@ static char *loopback_helper(char *buf, int buflen, const char *exten, const cha
snprintf(tmp, sizeof(tmp), "%d", priority);
memset(buf, 0, buflen);
AST_LIST_HEAD_INIT_NOLOCK(&headp);
- newvariable = ast_var_assign("EXTEN", exten);
- AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
- newvariable = ast_var_assign("CONTEXT", context);
- AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
- newvariable = ast_var_assign("PRIORITY", tmp);
- AST_LIST_INSERT_HEAD(&headp, newvariable, entries);
- pbx_substitute_variables_varshead(&headp, data, buf, buflen);
+ AST_LIST_INSERT_HEAD(&headp, ast_var_assign("EXTEN", exten), entries);
+ AST_LIST_INSERT_HEAD(&headp, ast_var_assign("CONTEXT", context), entries);
+ AST_LIST_INSERT_HEAD(&headp, ast_var_assign("PRIORITY", tmp), entries);
/* Substitute variables */
- while (!AST_LIST_EMPTY(&headp)) { /* List Deletion. */
- newvariable = AST_LIST_REMOVE_HEAD(&headp, entries);
- ast_var_delete(newvariable);
- }
+ pbx_substitute_variables_varshead(&headp, data, buf, buflen);
+ /* free the list */
+ while ((newvariable = AST_LIST_REMOVE_HEAD(&headp, entries)))
+ ast_var_delete(newvariable);
return buf;
}
@@ -110,14 +106,11 @@ static void loopback_subst(char **newexten, char **newcontext, int *priority, ch
char *con;
char *pri;
*newpattern = strchr(buf, '/');
- if (*newpattern) {
- *(*newpattern) = '\0';
- (*newpattern)++;
- }
+ if (*newpattern)
+ *(*newpattern)++ = '\0';
con = strchr(buf, '@');
if (con) {
- *con = '\0';
- con++;
+ *con++ = '\0';
pri = strchr(con, ':');
} else
pri = strchr(buf, ':');
--
GitLab