[Patch, libgfortran] Fix compile warnings

[Janne Blomqvist-3]

Hello,

the attached patch fixes a couple of compile warnings in libgfortran.
Regtested on x86_64-unknown-linux-gnu. Ok for trunk?

2009-10-30  Janne Blomqvist  <jb@...>

        * intrinsics/unpack_generic.c (unpack_internal): Remove unused
        argument from prototype.
        (unpack1): Update unpack_internal call.
        (unpack1_char): Likewise.
        (unpack1_char4): Likewise.
        (unpack0): Likewise.
        (unpack0_char): Likewise.
        (unpack0_char4): Likewise.
        * intrinsics/iso_c_binding.c (c_f_pointer_u0): Get rid of
        uninitialized variable warning.


--
Janne Blomqvist

[warn.diff]

---

diff --git a/libgfortran/intrinsics/iso_c_binding.c b/libgfortran/intrinsics/iso_c_binding.c
index ea1bab3..d0549b0 100644
--- a/libgfortran/intrinsics/iso_c_binding.c
+++ b/libgfortran/intrinsics/iso_c_binding.c
@@ -94,11 +94,11 @@ ISO_C_BINDING_PREFIX (c_f_pointer_u0) (void *c_ptr_in,
 
   if (shape != NULL)
     {
-      index_type source_stride;
-      index_type size, str;
+      index_type source_stride, size;
+      index_type str = 1;
       char *p;
 
-      f_ptr_out->offset = 0;
+      f_ptr_out->offset = str;
       shapeSize = 0;
       p = shape->data;
       size = GFC_DESCRIPTOR_SIZE(shape);
@@ -145,12 +145,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_u0) (void *c_ptr_in,
     }
   p += source_stride;
 
-  if (i == 0)
-    {
-      str = 1;
-      f_ptr_out->offset = str;
-    }
-  else
+  if (i != 0)
     {
       str = str * GFC_DESCRIPTOR_EXTENT(f_ptr_out,i-1);
       f_ptr_out->offset += str;
diff --git a/libgfortran/intrinsics/unpack_generic.c b/libgfortran/intrinsics/unpack_generic.c
index 4a4c219..a457988 100644
--- a/libgfortran/intrinsics/unpack_generic.c
+++ b/libgfortran/intrinsics/unpack_generic.c
@@ -57,7 +57,7 @@ unpack_bounds (gfc_array_char *ret, const gfc_array_char *vector,
 static void
 unpack_internal (gfc_array_char *ret, const gfc_array_char *vector,
  const gfc_array_l1 *mask, const gfc_array_char *field,
- index_type size, index_type fsize)
+ index_type size)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -345,8 +345,7 @@ unpack1 (gfc_array_char *ret, const gfc_array_char *vector,
 #endif
     }
 
-  unpack_internal (ret, vector, mask, field, size,
-   GFC_DESCRIPTOR_SIZE (field));
+  unpack_internal (ret, vector, mask, field, size);
 }
 
 
@@ -361,13 +360,13 @@ unpack1_char (gfc_array_char *ret,
       GFC_INTEGER_4 ret_length __attribute__((unused)),
       const gfc_array_char *vector, const gfc_array_l1 *mask,
       const gfc_array_char *field, GFC_INTEGER_4 vector_length,
-      GFC_INTEGER_4 field_length)
+      GFC_INTEGER_4 field_length __attribute__((unused)))
 {
 
   if (unlikely(compile_options.bounds_check))
     unpack_bounds (ret, vector, mask, field);
 
-  unpack_internal (ret, vector, mask, field, vector_length, field_length);
+  unpack_internal (ret, vector, mask, field, vector_length);
 }
 
 
@@ -382,15 +381,14 @@ unpack1_char4 (gfc_array_char *ret,
        GFC_INTEGER_4 ret_length __attribute__((unused)),
        const gfc_array_char *vector, const gfc_array_l1 *mask,
        const gfc_array_char *field, GFC_INTEGER_4 vector_length,
-       GFC_INTEGER_4 field_length)
+       GFC_INTEGER_4 field_length __attribute__((unused)))
 {
 
   if (unlikely(compile_options.bounds_check))
     unpack_bounds (ret, vector, mask, field);
 
   unpack_internal (ret, vector, mask, field,
-   vector_length * sizeof (gfc_char4_t),
-   field_length * sizeof (gfc_char4_t));
+   vector_length * sizeof (gfc_char4_t));
 }
 
 
@@ -543,7 +541,7 @@ unpack0 (gfc_array_char *ret, const gfc_array_char *vector,
   memset (&tmp, 0, sizeof (tmp));
   tmp.dtype = 0;
   tmp.data = field;
-  unpack_internal (ret, vector, mask, &tmp, GFC_DESCRIPTOR_SIZE (vector), 0);
+  unpack_internal (ret, vector, mask, &tmp, GFC_DESCRIPTOR_SIZE (vector));
 }
 
 
@@ -567,7 +565,7 @@ unpack0_char (gfc_array_char *ret,
   memset (&tmp, 0, sizeof (tmp));
   tmp.dtype = 0;
   tmp.data = field;
-  unpack_internal (ret, vector, mask, &tmp, vector_length, 0);
+  unpack_internal (ret, vector, mask, &tmp, vector_length);
 }
 
 
@@ -592,5 +590,5 @@ unpack0_char4 (gfc_array_char *ret,
   tmp.dtype = 0;
   tmp.data = field;
   unpack_internal (ret, vector, mask, &tmp,
-   vector_length * sizeof (gfc_char4_t), 0);
+   vector_length * sizeof (gfc_char4_t));
 }

---

[Steve Kargl]

On Fri, Oct 30, 2009 at 11:52:50PM +0200, Janne Blomqvist wrote:

> Hello,
>
> the attached patch fixes a couple of compile warnings in libgfortran.
> Regtested on x86_64-unknown-linux-gnu. Ok for trunk?
>
> 2009-10-30  Janne Blomqvist  <jb@...>
>
> * intrinsics/unpack_generic.c (unpack_internal): Remove unused
> argument from prototype.
> (unpack1): Update unpack_internal call.
> (unpack1_char): Likewise.
> (unpack1_char4): Likewise.
> (unpack0): Likewise.
> (unpack0_char): Likewise.
> (unpack0_char4): Likewise.
> * intrinsics/iso_c_binding.c (c_f_pointer_u0): Get rid of
> uninitialized variable warning.
>

OK.


--
Steve

[Janne Blomqvist-3]

On Sat, Oct 31, 2009 at 00:01, Steve Kargl
<sgk@...> wrote:

> On Fri, Oct 30, 2009 at 11:52:50PM +0200, Janne Blomqvist wrote:
>> Hello,
>>
>> the attached patch fixes a couple of compile warnings in libgfortran.
>> Regtested on x86_64-unknown-linux-gnu. Ok for trunk?
>>
>> 2009-10-30  Janne Blomqvist  <jb@...>
>>
>>       * intrinsics/unpack_generic.c (unpack_internal): Remove unused
>>       argument from prototype.
>>       (unpack1): Update unpack_internal call.
>>       (unpack1_char): Likewise.
>>       (unpack1_char4): Likewise.
>>       (unpack0): Likewise.
>>       (unpack0_char): Likewise.
>>       (unpack0_char4): Likewise.
>>       * intrinsics/iso_c_binding.c (c_f_pointer_u0): Get rid of
>>       uninitialized variable warning.
>>
>
> OK.

Thanks for the review, committed as r153769.



--
Janne Blomqvist