summaryrefslogtreecommitdiff
path: root/main/ast_expr2.y
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-10-28 20:01:28 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-10-28 20:01:28 +0000
commitd07eca63b62bec22c921e4ad4bbae2b5e4d93778 (patch)
treeba7a2eddadd18cc375db7468f14a82a528a26673 /main/ast_expr2.y
parent34c30c8ad3725e0c4a7242278ff2606f422cff93 (diff)
Merged revisions 293197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r293197 | tilghman | 2010-10-28 15:00:06 -0500 (Thu, 28 Oct 2010) | 33 lines Merged revisions 293195-293196 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r293195 | tilghman | 2010-10-28 14:52:52 -0500 (Thu, 28 Oct 2010) | 12 lines Merged revisions 293194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) | 5 lines "!00" evaluated as false, which is incorrect. Fixing. Reported (though the reporter did not understand he was reporting a bug) on the asterisk-users list: http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html ........ ................ r293196 | tilghman | 2010-10-28 14:54:34 -0500 (Thu, 28 Oct 2010) | 12 lines Merged revisions 293194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) | 5 lines "!00" evaluated as false, which is incorrect. Fixing. Reported (though the reporter did not understand he was reporting a bug) on the asterisk-users list: http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/ast_expr2.y')
-rw-r--r--main/ast_expr2.y4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index d963fba61..aabca8a46 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -1402,6 +1402,8 @@ op_compl (struct val *a)
v1 = 0;
else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' )
v1 = 0;
+ else
+ v1 = atoi(a->u.s);
}
break;
@@ -1414,6 +1416,8 @@ op_compl (struct val *a)
v1 = 0;
else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' )
v1 = 0;
+ else
+ v1 = atoi(a->u.s);
}
break;
}