Changeset 687

Timestamp:

10/27/09 12:59:41 (4 weeks ago)

Author:

robl

Message:

cleaned up a bunch of warnings

Location:

trunk/src

Files:

• lib/header.c (modified) (1 diff)
• lib/mpinetcdf.c (modified) (15 diffs)
• lib/nc.c (modified) (1 diff)
• lib/nc.h (modified) (2 diffs)
• lib/validator.c (modified) (2 diffs)
• utils/ncdump/ncdump.c (modified) (1 diff)
• utils/ncdump/vardata.c (modified) (10 diffs)

trunk/src/lib/header.c

@@ -1120 +1120 @@
   NCtype type = NC_UNSPECIFIED;
   NC_var **vpp, **end;
-  int i;
 
   assert(gbp != NULL && gbp->pos != NULL);

trunk/src/lib/mpinetcdf.c

@@ -63 +63 @@
 static int check_recsize_too_big(NC *ncp);
 
+static int ncmpi_coll_wait(NCMPI_Request request);
+static int ncmpi_coll_waitall(int count, NCMPI_Request array_of_requests[]);
+
 /* Begin Of Dataset Functions */
 
@@ -303 +306 @@
 ncmpi_enddef(int ncid) {
   int status = NC_NOERR;
-  int errcheck = 0;
-  int errflag = 0;
   NC *ncp;
 
@@ -310 +311 @@
   if(status != NC_NOERR)
     return status;
-
 
   if(!NC_indef(ncp))
@@ -834 +834 @@
 static int check_recsize_too_big(NC *ncp) 
 {
+    int ret = NC_NOERR;
     /* assertion: because recsize will be used to set up the file
      * view, we must ensure there is no overflow when specifying
@@ -843 +844 @@
     if (ncp->recsize != (MPI_Aint)ncp->recsize) {
             fprintf(stderr, "Type overflow: unable to read/write multiple records in this dataset\non this platform. Please either access records of this record variable\none-at-a-time or run on a 64 bit platform\n");
+            ret = NC_ESMALL;
     }
     /* the assert here might harsh, but without it, users will get corrupt
      * data.  */
     assert (ncp->recsize == (MPI_Aint)ncp->recsize);
+    return ret;
 }
 
@@ -8303 +8306 @@
   }
   } else {
-    ncmpi_coll_wait(request); 
+    return (ncmpi_coll_wait(*request));
   }
 }
@@ -8333 +8336 @@
     }
   } else {
-    ncmpi_coll_waitall(count, array_of_requests); 
+    return (ncmpi_coll_waitall(count, array_of_requests));
   }
 }
@@ -12480 +12483 @@
   return NC_NOERR;
 }
-int
+
+static int
 ncmpi_put_mvara_all_nonrecord(int ncid, int nvars, int varid[],
                    MPI_Offset *start[], MPI_Offset *count[],
@@ -12489 +12493 @@
   NC *ncp;
   void **xbuf = NULL, **cbuf = NULL;
-  char *temp_xbuf = NULL;
-  void *t_xbuf = NULL;
   int status = NC_NOERR, warning = NC_NOERR;
   int dim;
@@ -12909 +12911 @@
   return ((warning != NC_NOERR) ? warning : status);
 }
-int
+
+static int
 ncmpi_put_mvara_all_record(int ncid, int nvars, int varid[],
                    MPI_Offset *start[], MPI_Offset *count[],
@@ -12918 +12921 @@
   NC *ncp;
   void **xbuf = NULL, **cbuf = NULL;
-  char *temp_xbuf = NULL;
-  void *t_xbuf = NULL;
   int status = NC_NOERR, warning = NC_NOERR;
   int dim;
@@ -13162 +13163 @@
   NC_var *varp;
   NC *ncp;
-  void **xbuf = NULL, **cbuf = NULL;
-  char *temp_xbuf = NULL;
-  void *t_xbuf = NULL;
-  int status = NC_NOERR, warning = NC_NOERR;
-  int dim;
-  int *nelems, *cnelems, *el_size, *nbytes;
-  int total_nbytes;
-  MPI_Status mpistatus;
-  MPI_Comm comm;
-  int mpireturn;
-  MPI_Datatype *ptype;
-  MPI_Datatype buf_type;
-  int isderived, *iscontig_of_ptypes;
-  int i;
-  MPI_Aint *displacement, a0, ai;
-  int size;
+  int status = NC_NOERR;
 
   status = ncmpii_NC_check_id(ncid, &ncp);
@@ -13187 +13173 @@
 
  if (IS_RECVAR(varp))
-  ncmpi_put_mvara_all_record(ncid, nvars, varid, start, count, buf, bufcount, datatype);
+  status = ncmpi_put_mvara_all_record(ncid, nvars, varid, start, count, buf, bufcount, datatype);
  else 
-  ncmpi_put_mvara_all_nonrecord(ncid, nvars, varid, start, count, buf, bufcount, datatype);
+  status = ncmpi_put_mvara_all_nonrecord(ncid, nvars, varid, start, count, buf, bufcount, datatype);
+ return (status);
 }
 
@@ -13202 +13189 @@
   int status = NC_NOERR;
   int dim;
-  int nelems;
-  MPI_Status mpistatus;
-  MPI_Comm comm;
-  int mpireturn;
-  MPI_Datatype ptype;
-  int isderived, iscontig_of_ptypes;
  
   status = ncmpii_NC_check_id(ncid, &ncp);
@@ -13239 +13220 @@
 
 
-int
+static int
 ncmpi_coll_wait(NCMPI_Request request) {
-  ncmpi_put_vara_all(request->ncid, request->varid,
+  return (ncmpi_put_vara_all(request->ncid, request->varid,
                    request->start, request->count,
                    request->buf, request->bufcount,
-                   request->vartype);
+                   request->vartype));
 
 }

trunk/src/lib/nc.c

@@ -144 +144 @@
 }
 
+
+/* 'defined but not used': seems like a useful function though. why did we
+ * write it?  should we be using it? */
 
 static int

trunk/src/lib/nc.h

@@ -554 +554 @@
 ncmpii_NC_computeshapes(NC *ncp);
 
+extern int
+ncmpii_hdr_check_NC(bufferinfo *getbuf, NC *ncp);
 /* end defined in header.c */
 
@@ -569 +571 @@
 extern int
 ncmpiio_move(ncio *const nciop, MPI_Offset to, MPI_Offset from, MPI_Offset nbytes);
+
+extern int
+ncmpiio_get_hint(NC *ncp, char *key, char *value, int flag);
 
 extern int

trunk/src/lib/validator.c

@@ -447 +447 @@
   NC_string *strp;
   int status;
-  MPI_Offset ndims, tmp_dim;
+  MPI_Offset ndims, *tmp_dim;
   size_t dim;
   NC_var *varp;
@@ -475 +475 @@
       return status;
     }
-    tmp_dim = (MPI_Offset) varp->dimids + dim;
+    tmp_dim = (MPI_Offset*) (varp->dimids + dim);
     status = ncmpix_getn_long_long((const void **)(&gbp->pos), 
-                              1, &tmp_dim);
+                              1, tmp_dim);
     if(status != ENOERR) {
       ncmpii_free_NC_var(varp);

trunk/src/utils/ncdump/ncdump.c

@@ -360 +360 @@
     int ncmpi_status;           /* return from netcdf calls */
     int NC_mode;
-    int NC_version;
 
     ncmpi_status = ncmpi_open(MPI_COMM_WORLD, path, NC_NOWRITE, MPI_INFO_NULL, &ncid);

trunk/src/utils/ncdump/vardata.c

@@ -457 +457 @@
         printbval(sout, fmt, vp, *vals++);
         if (fsp->full_data_cmnts) {
-            Printf(sout);
+            Printf("%s", sout);
             Printf(",");
             annotate (vp, fsp, cor, iel);
@@ -467 +467 @@
     printbval(sout, fmt, vp, *vals++);
     if (fsp->full_data_cmnts) {
-        Printf(sout);
+        Printf("%s", sout);
         lastdelim (more, lastrow);
         annotate (vp, fsp, cor, iel);
@@ -505 +505 @@
         printsval(sout, fmt, vp, *vals++);
         if (fsp->full_data_cmnts) {
-            Printf(sout);
+            Printf("%s", sout);
             Printf(",");
             annotate (vp, fsp, cor, iel);
@@ -515 +515 @@
     printsval(sout, fmt, vp, *vals++);
     if (fsp->full_data_cmnts) {
-        Printf(sout);
+        Printf("%s", sout);
         lastdelim (more, lastrow);
         annotate (vp, fsp, cor, iel);
@@ -555 +555 @@
         printival(sout, fmt, vp, *vals++);
         if (fsp->full_data_cmnts) {
-            Printf(sout);
+            Printf("%s", sout);
             Printf(",");
             annotate (vp, fsp, cor, iel);
@@ -565 +565 @@
     printival(sout, fmt, vp, *vals++);
     if (fsp->full_data_cmnts) {
-        Printf(sout);
+        Printf("%s", sout);
         lastdelim (more, lastrow);
         annotate (vp, fsp, cor, iel);
@@ -603 +603 @@
         printfval(sout, fmt, vp, *vals++);
         if (fsp->full_data_cmnts) {
-            Printf(sout);
+            Printf("%s", sout);
             Printf(",");
             annotate (vp, fsp, cor, iel);
@@ -613 +613 @@
     printfval(sout, fmt, vp, *vals++);
     if (fsp->full_data_cmnts) {
-        Printf(sout);
+        Printf("%s", sout);
         lastdelim (more, lastrow);
         annotate (vp, fsp, cor, iel);
@@ -651 +651 @@
         printdval(sout, fmt, vp, *vals++);
         if (fsp->full_data_cmnts) {
-            Printf(sout);
+            Printf("%s", sout);
             Printf(",");
             annotate (vp, fsp, cor, iel);
@@ -661 +661 @@
     printdval(sout, fmt, vp, *vals++);
     if (fsp->full_data_cmnts) {
-        Printf(sout);
+        Printf("%s", sout);
         lastdelim (more, lastrow);
         annotate (vp, fsp, cor, iel);