inp_fix_ternary_operator_str(), local scope for `count'

This commit is contained in:
rlar 2013-10-03 11:16:54 +02:00
parent 6dc46a56b1
commit 3c71863c05
1 changed files with 3 additions and 4 deletions

View File

@ -1797,7 +1797,6 @@ inp_fix_ternary_operator_str(char *line, bool all)
{
char *conditional, *if_str, *else_str, *question, *colon, keep, *str_ptr, *str_ptr2, *str_ptr3, *new_str;
char *end_str = NULL, *beg_str = NULL;
int count = 0;
if (!strchr(line, '?') && !strchr(line, ':'))
return line;
@ -1837,7 +1836,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
str_ptr2 = skip_back_ws(question);
/* test for (conditional)?... */
if (str_ptr2[-1] == ')') {
count = 1;
int count = 1;
str_ptr = str_ptr2 - 1;
while ((count != 0) && (str_ptr != line)) {
str_ptr--;
@ -1873,7 +1872,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
str_ptr = skip_ws(question + 1);
if (*str_ptr == '(') {
// find closing paren
count = 1;
int count = 1;
str_ptr2 = str_ptr/* + 1*/;
while (count != 0 && *str_ptr2 != '\0') {
str_ptr2++;
@ -1911,7 +1910,7 @@ inp_fix_ternary_operator_str(char *line, bool all)
if (*str_ptr == '(') {
// find end paren ')'
bool found_paren = FALSE;
count = 0;
int count = 0;
str_ptr2 = str_ptr;
while (*str_ptr2 != '\0') {
if (*str_ptr2 == '(') {