From 075abad5eeda59a71431e749ff167e15f7904962 Mon Sep 17 00:00:00 2001
From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Sun, 12 Sep 2010 12:57:52 +0000
Subject: [PATCH] pack_generic.c (pack): Add missing return and fix whitespace.

	* intrinsics/pack_generic.c (pack): Add missing return and fix whitespace.
	* intrinsics/cshift0.c (cshift0): Fix whitespace.
	* intrinsics/unpack_generic.c (unpack1, unpack0): Fix whitespace.

From-SVN: r164230
---
 libgfortran/ChangeLog                   | 6 ++++++
 libgfortran/intrinsics/cshift0.c        | 4 ++--
 libgfortran/intrinsics/pack_generic.c   | 6 +++---
 libgfortran/intrinsics/unpack_generic.c | 7 ++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index bfd829ab9f1..d690be1ec61 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-12  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	* intrinsics/pack_generic.c (pack): Add missing return and fix whitespace.
+	* intrinsics/cshift0.c (cshift0): Fix whitespace.
+	* intrinsics/unpack_generic.c (unpack1, unpack0): Fix whitespace.
+
 2010-09-10  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	* runtime/string.c (compare0): Remove.
diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c
index b765803387d..3ba2b3792fa 100644
--- a/libgfortran/intrinsics/cshift0.c
+++ b/libgfortran/intrinsics/cshift0.c
@@ -218,7 +218,7 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array,
 
 	  cshift0_c4 ((gfc_array_c4 *) ret, (gfc_array_c4 *) array, shift,
 		      which);
-	      return;
+	  return;
 	}
       else
 	{
@@ -242,7 +242,7 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array,
 
 	  cshift0_c8 ((gfc_array_c8 *) ret, (gfc_array_c8 *) array, shift,
 		      which);
-	      return;
+	  return;
 	}
       else
 	{
diff --git a/libgfortran/intrinsics/pack_generic.c b/libgfortran/intrinsics/pack_generic.c
index ee6a4831db8..1b872ec1834 100644
--- a/libgfortran/intrinsics/pack_generic.c
+++ b/libgfortran/intrinsics/pack_generic.c
@@ -273,14 +273,12 @@ pack (gfc_array_char *ret, const gfc_array_char *array,
 
     case GFC_DTYPE_LOGICAL_4:
     case GFC_DTYPE_INTEGER_4:
-
       pack_i4 ((gfc_array_i4 *) ret, (gfc_array_i4 *) array,
 	       (gfc_array_l1 *) mask, (gfc_array_i4 *) vector);
       return;
 
     case GFC_DTYPE_LOGICAL_8:
     case GFC_DTYPE_INTEGER_8:
-
       pack_i8 ((gfc_array_i8 *) ret, (gfc_array_i8 *) array,
 	       (gfc_array_l1 *) mask, (gfc_array_i8 *) vector);
       return;
@@ -288,11 +286,11 @@ pack (gfc_array_char *ret, const gfc_array_char *array,
 #ifdef HAVE_GFC_INTEGER_16
     case GFC_DTYPE_LOGICAL_16:
     case GFC_DTYPE_INTEGER_16:
-
       pack_i16 ((gfc_array_i16 *) ret, (gfc_array_i16 *) array,
 		(gfc_array_l1 *) mask, (gfc_array_i16 *) vector);
       return;
 #endif
+
     case GFC_DTYPE_REAL_4:
       pack_r4 ((gfc_array_r4 *) ret, (gfc_array_r4 *) array,
 	       (gfc_array_l1 *) mask, (gfc_array_r4 *) vector);
@@ -316,6 +314,7 @@ pack (gfc_array_char *ret, const gfc_array_char *array,
 		(gfc_array_l1 *) mask, (gfc_array_r16 *) vector);
       return;
 #endif
+
     case GFC_DTYPE_COMPLEX_4:
       pack_c4 ((gfc_array_c4 *) ret, (gfc_array_c4 *) array,
 	       (gfc_array_l1 *) mask, (gfc_array_c4 *) vector);
@@ -374,6 +373,7 @@ pack (gfc_array_char *ret, const gfc_array_char *array,
 	{
 	  pack_i8 ((gfc_array_i8 *) ret, (gfc_array_i8 *) array,
 		   (gfc_array_l1 *) mask, (gfc_array_i8 *) vector);
+	  return;
 	}
 
 #ifdef HAVE_GFC_INTEGER_16
diff --git a/libgfortran/intrinsics/unpack_generic.c b/libgfortran/intrinsics/unpack_generic.c
index 2dcef78001e..0256b25f56a 100644
--- a/libgfortran/intrinsics/unpack_generic.c
+++ b/libgfortran/intrinsics/unpack_generic.c
@@ -250,6 +250,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *vector,
 		   mask, (gfc_array_i16 *) field);
       return;
 #endif
+
     case GFC_DTYPE_REAL_4:
       unpack1_r4 ((gfc_array_r4 *) ret, (gfc_array_r4 *) vector,
 		  mask, (gfc_array_r4 *) field);
@@ -264,7 +265,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *vector,
     case GFC_DTYPE_REAL_10:
       unpack1_r10 ((gfc_array_r10 *) ret, (gfc_array_r10 *) vector,
 		   mask, (gfc_array_r10 *) field);
-	  return;
+      return;
 #endif
 
 #ifdef HAVE_GFC_REAL_16
@@ -443,6 +444,7 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
 		   mask, (GFC_INTEGER_16 *) field);
       return;
 #endif
+
     case GFC_DTYPE_REAL_4:
       unpack0_r4 ((gfc_array_r4 *) ret, (gfc_array_r4 *) vector,
 		  mask, (GFC_REAL_4 *) field);
@@ -490,6 +492,7 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
 		   mask, (GFC_COMPLEX_16 *) field);
       return;
 #endif
+
     case GFC_DTYPE_DERIVED_2:
       if (GFC_UNALIGNED_2(ret->data) || GFC_UNALIGNED_2(vector->data)
 	  || GFC_UNALIGNED_2(field))
@@ -522,6 +525,7 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
 		      mask, (GFC_INTEGER_8 *) field);
 	  return;
 	}
+
 #ifdef HAVE_GFC_INTEGER_16
     case GFC_DTYPE_DERIVED_16:
       if (GFC_UNALIGNED_16(ret->data) || GFC_UNALIGNED_16(vector->data)
@@ -534,6 +538,7 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
 	  return;
 	}
 #endif
+
     }
 
   memset (&tmp, 0, sizeof (tmp));