Merge pull request #1697 from NOAA-GSD/ejh_not_on

add test for nc_inq_var_chunking on classic files

Author: WardF

include/nc4dispatch.h

@@ -110,8 +110,7 @@ extern "C" {
                     int *shufflep, int *deflatep, int *deflate_levelp,
                     int *fletcher32p, int *contiguousp, size_t *chunksizesp,
                     int *no_fill, void *fill_valuep, int *endiannessp,
-                    unsigned int* idp, size_t* nparamsp, unsigned int* params
-        );
+                    unsigned int* idp, size_t* nparamsp, unsigned int* params);
 
     EXTERNL int
     NC4_inq_varid(int ncid, const char *name, int *varidp);

libdispatch/dvarinq.c

@@ -735,76 +735,4 @@ nc_inq_var_szip(int ncid, int varid, int *options_maskp, int *pixels_per_blockp)
    return stat;
 }
 
-/*!
-Learn all about a variable.
-
-@param[in] ncid ncid for file.
-@param[in] varid varid for variable in question.
-@param[out] name Pointer to memory to contain the name of the
-variable.
-@param[out] xtypep Pointer to memory to contain the type of the
-variable.
-@param[out] ndimsp Pointer to memory to store the number of associated
-dimensions for the variable.
-@param[out] dimidsp Pointer to memory to store the dimids associated
-with the variable.
-@param[out] nattsp Pointer to memory to store the number of attributes
-associated with the variable.
-@param[out] shufflep Pointer to memory to store shuffle information
-associated with the variable.
-@param[out] deflatep Pointer to memory to store compression type
-associated with the variable.
-@param[out] deflate_levelp Pointer to memory to store compression
-level associated with the variable.
-@param[out] fletcher32p Pointer to memory to store compression
-information associated with the variable.
-@param[out] contiguousp Pointer to memory to store contiguous-data
-information associated with the variable.
-@param[out] chunksizesp Pointer to memory to store chunksize
-information associated with the variable.
-@param[out] no_fill Pointer to memory to store whether or not there is
-a fill value associated with the variable.
-@param[out] fill_valuep Pointer to memory to store the fill value (if
-one exists) for the variable.
-@param[out] endiannessp Pointer to memory to store endianness
-value. One of ::NC_ENDIAN_BIG ::NC_ENDIAN_LITTLE ::NC_ENDIAN_NATIVE
-@param[out] idp Pointer to memory to store filter id.
-@param[out] nparamsp Pointer to memory to store filter parameter count.
-@param[out] params Pointer to vector of unsigned integers into which
-to store filter parameters.
-\note Expose access to nc_inq_var_all().
-
-\returns ::NC_NOERR No error.
-\returns ::NC_EBADID Bad ncid.
-\returns ::NC_ENOTVAR Bad varid.
-\returns ::NC_ENOMEM Out of memory.
-\returns ::NC_EINVAL Invalid input.
-\author Ed Hartnett, Dennis Heimbigner
-\internal
-\ingroup variables
-*/
-#if 0
-int
-NC_inq_var_all(int ncid, int varid, char *name, nc_type *xtypep,
-               int *ndimsp, int *dimidsp, int *nattsp,
-               int *shufflep, int *deflatep, int *deflate_levelp,
-               int *fletcher32p, int *contiguousp, size_t *chunksizesp,
-               int *no_fill, void *fill_valuep, int *endiannessp,
-	       unsigned int* unused1, size_t* unused2, unsigned int* unused3
-               )
-{
-   NC* ncp;
-   int stat = NC_check_id(ncid,&ncp);
-   if(stat != NC_NOERR) return stat;
-   return ncp->dispatch->inq_var_all(
-      ncid, varid, name, xtypep,
-      ndimsp, dimidsp, nattsp,
-      shufflep, deflatep, deflate_levelp, fletcher32p,
-      contiguousp, chunksizesp,
-      no_fill, fill_valuep,
-      endiannessp,
-      NULL, NULL, NULL);
-}
-#endif
-
 /*! \} */  /* End of named group ...*/