nvc compile warning: transfer of control bypasses initialization of: [branch_past_initialization]

Author: wkliao

src/drivers/common/dtype_decode.c

@@ -300,8 +300,11 @@ int ncmpii_dtype_decode(MPI_Datatype  dtype,
     MPI_Aint *array_of_adds=NULL;
 #ifdef HAVE_MPI_LARGE_COUNT
     MPI_Count num_ints, num_adds, num_larges, num_dtypes, *array_of_larges;
+    int *distribs, *dargs, *psizes;
+    MPI_Count *gzises;
 #else
     int num_ints, num_adds, num_dtypes;
+    int *gzises, *distribs, *dargs, *psizes;
 #endif
 
     el_size   = 0;
@@ -553,8 +556,6 @@ int ncmpii_dtype_decode(MPI_Datatype  dtype,
             if (iscontig_of_ptypes) *iscontig_of_ptypes = 0;
             ndims = array_of_ints[2];
 #ifdef HAVE_MPI_LARGE_COUNT
-            int *distribs, *dargs, *psizes;
-            MPI_Count *gzises;
             if (is_large_type) {
                 gzises   = array_of_larges;
                 distribs = array_of_ints+3;          /* array_of_distribs[ndims] */
@@ -569,10 +570,10 @@ int ncmpii_dtype_decode(MPI_Datatype  dtype,
                 psizes   = array_of_ints+3+3*ndims;  /* array_of_psizes[ndims] */
             }
 #else
-            int *gzises   = array_of_ints+3;         /* array_of_gsizes[ndims] */
-            int *distribs = array_of_ints+3+ndims;   /* array_of_distribs[ndims] */
-            int *dargs    = array_of_ints+3+2*ndims; /* array_of_dargs[ndims] */
-            int *psizes   = array_of_ints+3+3*ndims; /* array_of_psizes[ndims] */
+            gzises   = array_of_ints+3;         /* array_of_gsizes[ndims] */
+            distribs = array_of_ints+3+ndims;   /* array_of_distribs[ndims] */
+            dargs    = array_of_ints+3+2*ndims; /* array_of_dargs[ndims] */
+            psizes   = array_of_ints+3+3*ndims; /* array_of_psizes[ndims] */
 #endif
             /* seldom reached, so put it in a separate function */
             total_blocks = darray_get_totalblks(array_of_ints[1],  /* rank */

src/drivers/ncmpio/ncmpio_vard.c

@@ -60,6 +60,16 @@ getput_vard(NC               *ncp,
     MPI_Offset nelems=0, fnelems=0, bnelems=0, offset=0;
     MPI_Datatype etype=MPI_DATATYPE_NULL, xtype=MPI_BYTE;
     MPI_Offset filetype_size;
+#ifdef HAVE_MPI_TYPE_SIZE_C
+    MPI_Count true_lb=0, true_ub=0, true_extent=0;
+    MPI_Count type_size;
+#elif defined(HAVE_MPI_TYPE_SIZE_X)
+    MPI_Count true_lb=0, true_ub=0, true_extent=0;
+    MPI_Count type_size;
+#else
+    MPI_Aint true_lb=0, true_ub=0, true_extent=0;
+    int type_size;
+#endif
 
 #ifdef ENABLE_SUBFILING
     /* call a separate routine if variable is stored in subfiles */
@@ -86,24 +96,15 @@ getput_vard(NC               *ncp,
      */
 #ifdef HAVE_MPI_TYPE_SIZE_C
     /* MPI_Type_size_c is introduced in MPI 4.0 */
-    MPI_Count true_lb=0, true_ub=0, true_extent=0;
-    MPI_Count type_size;
-
     mpireturn = MPI_Type_size_c(filetype, &type_size);
 #elif defined(HAVE_MPI_TYPE_SIZE_X)
     /* MPI_Type_size_x is introduced in MPI 3.0 */
-    MPI_Count true_lb=0, true_ub=0, true_extent=0;
-    MPI_Count type_size;
-
     mpireturn = MPI_Type_size_x(filetype, &type_size);
 #else
     /* PROBLEM: In MPI_Type_size(), argument filetype_size is a 4-byte integer,
      * cannot be used for large filetypes. Prior to MPI 3.0 standard, argument
      * "size" of MPI_Type_size is of type int. When int overflows, the returned
      * value in argument "size" may be a negative. */
-    MPI_Aint true_lb=0, true_ub=0, true_extent=0;
-    int type_size;
-
     mpireturn = MPI_Type_size(filetype, &type_size);
 #endif
     if (mpireturn != MPI_SUCCESS) {