From: Tobias Burnus <burnus@net-b.de>
Date: Sat, 6 Dec 2014 16:53:40 +0000 (+0100)
Subject: error.c (gfc_error_check): Use bool not int.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5a9fd3e94138512e2f999316baff7790e971174;p=gcc.git

error.c (gfc_error_check): Use bool not int.

2014-12-06  Tobias Burnus  <burnus@net-b.de>

        * error.c (gfc_error_check): Use bool not int.
        * gfortran.h (gfc_error_check): Update prototype.
        * match.c (gfc_match_if): Update call.
        * parse.c (decode_statement, decode_omp_directive,
        decode_gcc_attribute): Ditto.

From-SVN: r218450
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 137303cfc0d..f7afb17e78b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-06  Tobias Burnus  <burnus@net-b.de>
+
+	* error.c (gfc_error_check): Use bool not int.
+	* gfortran.h (gfc_error_check): Update prototype.
+	* match.c (gfc_match_if): Update call.
+	* parse.c (decode_statement, decode_omp_directive,
+	decode_gcc_attribute): Ditto.
+
 2014-12-06  Tobias Burnus  <burnus@net-b.de>
 	    Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
diff --git a/gcc/fortran/error.c b/gcc/fortran/error.c
index db4bcf38729..a93c7f903fb 100644
--- a/gcc/fortran/error.c
+++ b/gcc/fortran/error.c
@@ -1440,14 +1440,12 @@ gfc_error_flag_test (void)
 /* Check to see if any errors have been saved.
    If so, print the error.  Returns the state of error_flag.  */
 
-int
+bool
 gfc_error_check (void)
 {
-  int rc;
-
-  rc = error_buffer.flag;
+  bool error_raised = (bool) error_buffer.flag;
 
-  if (error_buffer.flag)
+  if (error_raised)
     {
       if (error_buffer.message != NULL)
 	fputs (error_buffer.message, stderr);
@@ -1459,7 +1457,7 @@ gfc_error_check (void)
 	exit (FATAL_EXIT_CODE);
     }
 
-  return rc;
+  return error_raised;
 }
 
 
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 02e78f79e83..0ed42d0845e 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -2688,7 +2688,7 @@ void gfc_error_now (const char *, ...) ATTRIBUTE_GCC_GFC(1,2);
 void gfc_fatal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_GCC_GFC(1,2);
 void gfc_internal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_GCC_GFC(1,2);
 void gfc_clear_error (void);
-int gfc_error_check (void);
+bool gfc_error_check (void);
 bool gfc_error_flag_test (void);
 
 notification gfc_notification_std (int);
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index 06f1e94dfee..3b81a464e74 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -1497,7 +1497,7 @@ gfc_match_if (gfc_statement *if_type)
 
   /* All else has failed, so give up.  See if any of the matchers has
      stored an error message of some sort.  */
-  if (gfc_error_check () == 0)
+  if (!gfc_error_check ())
     gfc_error ("Unclassifiable statement in IF-clause at %C");
 
   gfc_free_expr (expr);
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index 1023037dfe1..e39a5508de2 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -549,7 +549,7 @@ decode_statement (void)
   /* All else has failed, so give up.  See if any of the matchers has
      stored an error message of some sort.  */
 
-  if (gfc_error_check () == 0)
+  if (!gfc_error_check ())
     gfc_error_now ("Unclassifiable statement at %C");
 
   reject_statement ();
@@ -769,7 +769,7 @@ decode_omp_directive (void)
 
   if (gfc_option.gfc_flag_openmp || simd_matched)
     {
-      if (gfc_error_check () == 0)
+      if (!gfc_error_check ())
 	gfc_error_now ("Unclassifiable OpenMP directive at %C");
     }
 
@@ -796,7 +796,7 @@ decode_gcc_attribute (void)
   /* All else has failed, so give up.  See if any of the matchers has
      stored an error message of some sort.  */
 
-  if (gfc_error_check () == 0)
+  if (!gfc_error_check ())
     gfc_error_now ("Unclassifiable GCC directive at %C");
 
   reject_statement ();