summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2011-11-05 23:07:55 +0200
committerVille Skyttä <ville.skytta@iki.fi>2011-11-05 23:07:55 +0200
commitda936332dc117580a0f6a04aa17525e1c31b77d9 (patch)
tree7e0f908bf8ac788f07d79bf6eeed39b0dc4c00d4
parentfbc4f38c31feba097d62271e8cd45dcf8533e42f (diff)
downloadvdr-plugin-text2skin-da936332dc117580a0f6a04aa17525e1c31b77d9.tar.gz
vdr-plugin-text2skin-da936332dc117580a0f6a04aa17525e1c31b77d9.tar.bz2
Reduce scope of some variables.
-rw-r--r--render.c4
-rw-r--r--xml/function.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/render.c b/render.c
index aaedb56..2e17669 100644
--- a/render.c
+++ b/render.c
@@ -748,7 +748,6 @@ cxType cText2SkinRender::GetToken(const txToken &Token)
cxType res = mRender->GetTokenData(Token);
if (Token.Attrib.Type == aClean) {
std::string str = res.String();
- int pos = -1;
if (Token.Type == tMenuCurrent) {
const char *ptr = str.c_str();
@@ -761,6 +760,7 @@ cxType cText2SkinRender::GetToken(const txToken &Token)
Dprintf("MenuCurrent result: |%s|\n", res.String().c_str());
}
else if (Token.Type == tMenuTitle) {
+ int pos;
if ((pos = str.find(" - ")) != -1) {
str.erase(pos);
while (str[str.length() - 1] == ' ')
@@ -780,9 +780,9 @@ cxType cText2SkinRender::GetToken(const txToken &Token)
}
else if (Token.Attrib.Type == aRest) {
std::string str = res.String();
- int pos = -1;
if (Token.Type == tMenuTitle) {
+ int pos;
if ((pos = str.find(" - ")) != -1) {
str.erase(0, pos + 3);
while (str[0] == ' ')
diff --git a/xml/function.c b/xml/function.c
index c9994e9..62c097f 100644
--- a/xml/function.c
+++ b/xml/function.c
@@ -54,7 +54,6 @@ bool cxFunction::Parse(const std::string &Text)
const char *text = Text.c_str();
const char *ptr = text, *last = text;
eType type = undefined_function;
- int inExpr = 0;
cxFunction *expr;
if (*ptr == '\'' || *ptr == '{') {
@@ -95,6 +94,7 @@ bool cxFunction::Parse(const std::string &Text)
}
else {
// expression
+ int inExpr = 0;
for (; *ptr; ++ptr) {
if (*ptr == '(') {
if (inExpr++ == 0) {