From acaed831f6cc09ef9d7661ce7a4532a7e0d72db7 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Thu, 10 Jun 2010 08:06:08 +0000 Subject: [PATCH] error.c (error_print): Pre-initialize loc by NULL. 2010-06-10 Kai Tietz * error.c (error_print): Pre-initialize loc by NULL. * openmp.c (resolve_omp_clauses): Add explicit braces to avoid ambigous else. * array.c (match_subscript): Pre-initialize m to MATCH_ERROR. From-SVN: r160525 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/array.c | 2 +- gcc/fortran/error.c | 2 +- gcc/fortran/openmp.c | 38 +++++++++++++++++++++----------------- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b7c1ecd9743a..ae54bc552d83 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2010-06-10 Kai Tietz + + * error.c (error_print): Pre-initialize loc by NULL. + * openmp.c (resolve_omp_clauses): Add explicit + braces to avoid ambigous else. + * array.c (match_subscript): Pre-initialize m to MATCH_ERROR. + 2010-06-10 Gerald Pfeifer * gfc-internals.texi: Move to GFDL 1.3. diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 3ffc39714da0..64816f28abbd 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -64,7 +64,7 @@ gfc_copy_array_ref (gfc_array_ref *src) static match match_subscript (gfc_array_ref *ar, int init, bool match_star) { - match m; + match m = MATCH_ERROR; bool star = false; int i; diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c index b05e669c3707..30928286c986 100644 --- a/gcc/fortran/error.c +++ b/gcc/fortran/error.c @@ -471,7 +471,7 @@ error_print (const char *type, const char *format0, va_list argp) locus *l1, *l2, *loc; const char *format; - l1 = l2 = NULL; + loc = l1 = l2 = NULL; have_l1 = 0; pos = -1; diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 6a56515298e8..0e25bf48cb39 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -845,11 +845,13 @@ resolve_omp_clauses (gfc_code *code) for (list = 0; list < OMP_LIST_NUM; list++) if (list != OMP_LIST_FIRSTPRIVATE && list != OMP_LIST_LASTPRIVATE) for (n = omp_clauses->lists[list]; n; n = n->next) - if (n->sym->mark) - gfc_error ("Symbol '%s' present on multiple clauses at %L", - n->sym->name, &code->loc); - else - n->sym->mark = 1; + { + if (n->sym->mark) + gfc_error ("Symbol '%s' present on multiple clauses at %L", + n->sym->name, &code->loc); + else + n->sym->mark = 1; + } gcc_assert (OMP_LIST_LASTPRIVATE == OMP_LIST_FIRSTPRIVATE + 1); for (list = OMP_LIST_FIRSTPRIVATE; list <= OMP_LIST_LASTPRIVATE; list++) @@ -862,22 +864,24 @@ resolve_omp_clauses (gfc_code *code) } for (n = omp_clauses->lists[OMP_LIST_FIRSTPRIVATE]; n; n = n->next) - if (n->sym->mark) - gfc_error ("Symbol '%s' present on multiple clauses at %L", - n->sym->name, &code->loc); - else - n->sym->mark = 1; - + { + if (n->sym->mark) + gfc_error ("Symbol '%s' present on multiple clauses at %L", + n->sym->name, &code->loc); + else + n->sym->mark = 1; + } for (n = omp_clauses->lists[OMP_LIST_LASTPRIVATE]; n; n = n->next) n->sym->mark = 0; for (n = omp_clauses->lists[OMP_LIST_LASTPRIVATE]; n; n = n->next) - if (n->sym->mark) - gfc_error ("Symbol '%s' present on multiple clauses at %L", - n->sym->name, &code->loc); - else - n->sym->mark = 1; - + { + if (n->sym->mark) + gfc_error ("Symbol '%s' present on multiple clauses at %L", + n->sym->name, &code->loc); + else + n->sym->mark = 1; + } for (list = 0; list < OMP_LIST_NUM; list++) if ((n = omp_clauses->lists[list]) != NULL) { -- 2.39.5