From ad42dfe1dddbed461ba2e2e81a60bddaf6c8abfa Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Thu, 28 Jun 2007 19:02:31 +0000
Subject: [PATCH] move variable declarations to the beginning of a block. Not
applicable to previous branches.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_sms.c | 6 ++++--
res/res_features.c | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/apps/app_sms.c b/apps/app_sms.c
index b375a7f07e..a6fb5abfca 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -512,11 +512,13 @@ static int packsms(unsigned char dcs, unsigned char *base, unsigned int udhl, un
static void packdate(unsigned char *o, time_t w)
{
struct tm t;
+ int z;
+
ast_localtime(&w, &t, NULL);
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__)
- int z = -t.tm_gmtoff / 60 / 15;
+ z = -t.tm_gmtoff / 60 / 15;
#else
- int z = timezone / 60 / 15;
+ z = timezone / 60 / 15;
#endif
*o++ = ((t.tm_year % 10) << 4) + (t.tm_year % 100) / 10;
*o++ = (((t.tm_mon + 1) % 10) << 4) + (t.tm_mon + 1) / 10;
diff --git a/res/res_features.c b/res/res_features.c
index 228908dbaa..629fea3fbd 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -2838,7 +2838,6 @@ static int load_config(void)
AST_RWLIST_WRLOCK(&feature_groups);
ctg = NULL;
- struct ast_call_feature *feature;
while ((ctg = ast_category_browse(cfg, ctg))) {
for (i = 0; i < ARRAY_LEN(categories); i++) {
if (!strcasecmp(categories[i], ctg))
@@ -2852,6 +2851,8 @@ static int load_config(void)
continue;
for (var = ast_variable_browse(cfg, ctg); var; var = var->next) {
+ struct ast_call_feature *feature;
+
AST_LIST_LOCK(&feature_list);
if(!(feature = find_dynamic_feature(var->name)) &&
!(feature = ast_find_call_feature(var->name))) {
--
GitLab