diff options
| author | Kai Tietz <kai.tietz@onevision.com> | 2010-06-10 08:06:08 +0000 |
|---|---|---|
| committer | Kai Tietz <ktietz@gcc.gnu.org> | 2010-06-10 10:06:08 +0200 |
| commit | acaed831f6cc09ef9d7661ce7a4532a7e0d72db7 (patch) | |
| tree | 0a3c1b7266c33fae2cdf48b04ca5172331de4581 | |
| parent | e4f32cb0a55eefcd56b1c42bcaf5c8aadc692ba6 (diff) | |
| download | gcc-acaed831f6cc09ef9d7661ce7a4532a7e0d72db7.zip gcc-acaed831f6cc09ef9d7661ce7a4532a7e0d72db7.tar.gz gcc-acaed831f6cc09ef9d7661ce7a4532a7e0d72db7.tar.bz2 | |
error.c (error_print): Pre-initialize loc by NULL.
2010-06-10 Kai Tietz <kai.tietz@onevision.com>
* 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
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/array.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/error.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/openmp.c | 38 |
4 files changed, 30 insertions, 19 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b7c1ecd..ae54bc5 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2010-06-10 Kai Tietz <kai.tietz@onevision.com> + + * 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 <gerald@pfeifer.com> * gfc-internals.texi: Move to GFDL 1.3. diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 3ffc397..64816f2 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 b05e669..3092828 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 6a56515..0e25bf4 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) { |