ruby-netcdf 0.7.1 → 0.8.0

data/{netcdfraw.c → ext/numru/netcdfraw.c}

@@ -198,7 +198,7 @@ typedef int    na_shape_t;
   obj = na_cast_object(obj, NA_SINT); \
   GetNArray(obj, na); \
   ptr = (int16_t *) NA_PTR(na,0); \
-} 
+}
 #define Array_to_Clint(obj, ptr) \
 { \
   struct NARRAY *na; \
@@ -257,7 +257,7 @@ static VALUE rb_eNetcdfFatal;
 static VALUE rb_eNetcdfEntool;
 static VALUE rb_eNetcdfExdr;
 static VALUE rb_eNetcdfSyserr;
- 
+
 
 struct Netcdf{
   int ncid;
@@ -290,7 +290,7 @@ NetCDF_init(int ncid,char *filename)
   Netcdffile->ncid=ncid;
   Netcdffile->closed=0;
   Netcdffile->name=xmalloc((strlen(filename)+1)*sizeof(char));
-  strcpy(Netcdffile->name,filename);  
+  strcpy(Netcdffile->name,filename);
   return(Netcdffile);
 }
 
@@ -322,7 +322,7 @@ NetCDF_att_init(int ncid,int varid,char *attname)
   Netcdf_att->ncid=ncid;
   Netcdf_att->varid=varid;
   Netcdf_att->name=xmalloc((strlen(attname)+1)*sizeof(char));
-  strcpy(Netcdf_att->name,attname);   
+  strcpy(Netcdf_att->name,attname);
   return(Netcdf_att);
 }
 
@@ -351,7 +351,7 @@ NetCDF_free(struct Netcdf *Netcdffile)
   if (!Netcdffile->closed){
       nc_close(Netcdffile->ncid); /* no error check -- not to stop during GC */
   }
-  free(Netcdffile->name); 
+  free(Netcdffile->name);
   free(Netcdffile);
 }
 
@@ -576,14 +576,11 @@ NetCDF_close(file)
   int ncid;
   struct Netcdf *Netcdffile;
 
-  if (rb_safe_level() >= 3 && !OBJ_TAINTED(file)) {
-      rb_raise(rb_eSecurityError, "Insecure: can't close");
-  }
   Data_Get_Struct(file,struct Netcdf,Netcdffile);
   ncid=Netcdffile->ncid;
   if(!Netcdffile->closed){
       status = nc_close(ncid);
-      if(status != NC_NOERR) NC_RAISE(status); 
+      if(status != NC_NOERR) NC_RAISE(status);
       Netcdffile->closed = 1;
   } else {
       rb_warn("file %s is already closed", Netcdffile->name);
@@ -602,10 +599,9 @@ NetCDF_def_dim(VALUE file,VALUE dim_name,VALUE length)
   struct Netcdf *Netcdffile;
   struct NetCDFDim *Netcdf_dim;
   VALUE Dimension;
-  
-  rb_secure(3);
+
   Data_Get_Struct(file,struct Netcdf,Netcdffile);
-  
+
   Check_Type(dim_name,T_STRING);
   c_dim_name=RSTRING_PTR(dim_name);
   c_length=NUM2UINT(length);
@@ -696,19 +692,19 @@ NetCDF_put_att_numeric(int ncid, char *name,VALUE value,VALUE atttype, int varid
     len = na_val->total;
     ptr = na_val->ptr;
     switch(na_typecode){
-    case NA_BYTE: 
+    case NA_BYTE:
 	status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,(unsigned char *)ptr);
 	break;
-    case NA_SINT: 
+    case NA_SINT:
 	status = nc_put_att_short(ncid,varid,name,NC_SHORT,len,(short *)ptr);
 	break;
-    case NA_LINT: 
+    case NA_LINT:
 	status = nc_put_att_int(ncid,varid,name,NC_INT,len,(int *)ptr);
 	break;
-    case NA_SFLOAT: 
+    case NA_SFLOAT:
 	status = nc_put_att_float(ncid,varid,name,NC_FLOAT,len,(float *)ptr);
 	break;
-    case NA_DFLOAT: 
+    case NA_DFLOAT:
 	status = nc_put_att_double(ncid,varid,name,NC_DOUBLE,len,(double*)ptr);
 	break;
     default:
@@ -746,7 +742,6 @@ NetCDF_put_att(VALUE file,VALUE att_name,VALUE value,VALUE atttype)
     struct Netcdf *ncfile;
     char *name;
 
-    rb_secure(3);
     Data_Get_Struct(file,struct Netcdf,ncfile);
     Check_Type(att_name,T_STRING);
     name = RSTRING_PTR(att_name);
@@ -764,7 +759,6 @@ NetCDF_put_att_var(VALUE var,VALUE att_name,VALUE value,VALUE atttype)
     struct NetCDFVar *ncvar;
     char *name;
 
-    rb_secure(3);
     Data_Get_Struct(var,struct NetCDFVar,ncvar);
     Check_Type(att_name,T_STRING);
     name = RSTRING_PTR(att_name);
@@ -791,20 +785,19 @@ NetCDF_def_var(VALUE file,VALUE var_name,VALUE vartype,VALUE dimensions)
   struct NetCDFDim *Netcdf_dim;
   VALUE Var;
 
-  rb_secure(3);
   Check_Type(var_name,T_STRING);
   Check_Type(dimensions,T_ARRAY);
 
   c_var_name=RSTRING_PTR(var_name);
   c_ndims=RARRAY_LEN(dimensions);
-  
+
   Data_Get_Struct(file,struct Netcdf,Netcdffile);
   ncid=Netcdffile->ncid;
 
   if (TYPE(vartype) == T_STRING){
-      xtype = natype2nctype(RSTRING_PTR(vartype));     
+      xtype = natype2nctype(RSTRING_PTR(vartype));
   } else if (TYPE(vartype) == T_FIXNUM){
-      xtype = natypecode2nctype(NUM2INT(vartype));     
+      xtype = natypecode2nctype(NUM2INT(vartype));
   } else {
       rb_raise(rb_eNetcdfError,
 	       "type specfication must be by a string or nil");
@@ -827,12 +820,12 @@ NetCDF_def_var(VALUE file,VALUE var_name,VALUE vartype,VALUE dimensions)
       rb_raise(rb_eNetcdfError, "No such object of the netCDF dimension class.");
     }
   }
-  
+
   status = nc_def_var(ncid,c_var_name,xtype,c_ndims,c_dimids,&varidp);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Netcdf_var = NetCDF_var_init(ncid,varidp,file);
-  
+
   Var=Data_Wrap_Struct(cNetCDFVar,nc_mark_obj,NetCDF_var_free,Netcdf_var);
   return Var;
 }
@@ -852,10 +845,10 @@ NetCDF_dim(VALUE file,VALUE dim_name)
   ncid=Netcdffile->ncid;
   Check_Type(dim_name,T_STRING);
   c_dim_name=RSTRING_PTR(dim_name);
-  
+
   status = nc_inq_dimid(ncid,c_dim_name,&dimidp);
   if(status !=NC_NOERR){
-    if(status == NC_EBADDIM){ 
+    if(status == NC_EBADDIM){
       return(Qnil);  /*2003/08/27 back to orig (from changes on 2003/02/03)*/
     } else{
       NC_RAISE(status);
@@ -863,14 +856,14 @@ NetCDF_dim(VALUE file,VALUE dim_name)
   }
 
   Netcdf_dim=NetCDF_dim_init(ncid,dimidp);
-  
+
   Dimension = Data_Wrap_Struct(cNetCDFDim,0,NetCDF_dim_free,Netcdf_dim);
   return Dimension;
 }
 
-VALUE  
+VALUE
 NetCDF_var(VALUE file,VALUE var_name)
-{  
+{
   int ncid;
   int status;
   int varidp;
@@ -883,16 +876,16 @@ NetCDF_var(VALUE file,VALUE var_name)
   ncid=Netcdffile->ncid;
   Check_Type(var_name,T_STRING);
   c_var_name=RSTRING_PTR(var_name);
-  
+
   status=nc_inq_varid(ncid,c_var_name,&varidp);
   if(status != NC_NOERR){
     if(status == NC_ENOTVAR){
       return(Qnil); /*2003/08/27 back to orig (from changes on 2003/02/03)*/
-    } else{ 
+    } else{
       NC_RAISE(status);
     }
   }
-  
+
   Netcdf_var = NetCDF_var_init(ncid,varidp,file);
   Variable = Data_Wrap_Struct(cNetCDFVar,nc_mark_obj,NetCDF_var_free,Netcdf_var);
   return Variable;
@@ -913,7 +906,7 @@ NetCDF_att(VALUE file,VALUE att_name)
   ncid=Netcdffile->ncid;
   Check_Type(att_name,T_STRING);
   c_att_name=RSTRING_PTR(att_name);
-  
+
 
   status = nc_inq_attid(ncid,NC_GLOBAL,c_att_name,&attnump);
   if(status != NC_NOERR){
@@ -924,11 +917,11 @@ NetCDF_att(VALUE file,VALUE att_name)
       NC_RAISE(status);
     }
   }
-  
+
   Netcdf_att = NetCDF_att_init(ncid,NC_GLOBAL,c_att_name);
-  
+
   Attribute = Data_Wrap_Struct(cNetCDFAtt,0,Netcdf_att_free,Netcdf_att);
-   
+
   return Attribute;
 }
 VALUE
@@ -938,7 +931,7 @@ NetCDF_fill(VALUE file,VALUE mode)
   int status;
   struct Netcdf *Netcdffile;
   int old_modep;
-  
+
   Data_Get_Struct(file,struct Netcdf,Netcdffile);
   ncid = Netcdffile->ncid;
   if(mode==Qfalse){
@@ -961,7 +954,6 @@ NetCDF_redef(VALUE file)
   int status;
   struct Netcdf *Netcdffile;
 
-  rb_secure(3);
   Data_Get_Struct(file,struct Netcdf,Netcdffile);
   ncid=Netcdffile->ncid;
   status = nc_redef(ncid);
@@ -976,18 +968,17 @@ NetCDF_redef(VALUE file)
   return Qtrue;
 }
 
-VALUE 
+VALUE
 NetCDF_enddef(VALUE file)
 {
   int ncid;
   int status;
   struct Netcdf *Netcdffile;
 
-  rb_secure(3);
   Data_Get_Struct(file,struct Netcdf,Netcdffile);
   ncid=Netcdffile->ncid;
   status = nc_enddef(ncid);
-  if(status !=NC_NOERR){ 
+  if(status !=NC_NOERR){
     if(status == NC_ENOTINDEFINE){
       return Qnil;
     }
@@ -998,7 +989,7 @@ NetCDF_enddef(VALUE file)
   return Qtrue;
 }
 
-VALUE 
+VALUE
 NetCDF_whether_in_define_mode(VALUE file)
 {
   /* returns true if the NetCDF object is currently in the define mode,
@@ -1010,7 +1001,6 @@ NetCDF_whether_in_define_mode(VALUE file)
   int status;
   struct Netcdf *Netcdffile;
 
-  rb_secure(3);
   Data_Get_Struct(file,struct Netcdf,Netcdffile);
   ncid=Netcdffile->ncid;
   status = nc_redef(ncid);
@@ -1030,7 +1020,7 @@ NetCDF_whether_in_define_mode(VALUE file)
 }
 
 VALUE
-NetCDF_open(VALUE mod,VALUE filename,VALUE omode)     
+NetCDF_open(VALUE mod,VALUE filename,VALUE omode)
 {
   int status;
   int ncid;
@@ -1044,7 +1034,7 @@ NetCDF_open(VALUE mod,VALUE filename,VALUE omode)
   c_filename=RSTRING_PTR(filename);
   Check_Type(omode,T_FIXNUM);
   c_omode=NUM2INT(omode);
-  
+
   status = nc_open(c_filename,c_omode,&ncid);
   if(status !=NC_NOERR){NC_RAISE2(status,c_filename);}
 
@@ -1061,13 +1051,13 @@ NetCDF_create(VALUE mod,VALUE filename,VALUE cmode)
   char* c_filename;
   int c_cmode;
   struct Netcdf *ncfile;
-  
+
   Check_Type(filename,T_STRING);
   SafeStringValue(filename);
   c_filename=RSTRING_PTR(filename);
   Check_Type(cmode,T_FIXNUM);
   c_cmode=NUM2INT(cmode);
-  
+
   status = nc_create(c_filename,c_cmode,&ncid);
   if(status != NC_NOERR) NC_RAISE2(status, c_filename);
 
@@ -1075,7 +1065,7 @@ NetCDF_create(VALUE mod,VALUE filename,VALUE cmode)
   return( Data_Wrap_Struct(cNetCDF,0,NetCDF_free,ncfile) );
 }
 
-VALUE 
+VALUE
 NetCDF_ndims(VALUE file)
 {
   int ncid;
@@ -1092,7 +1082,7 @@ NetCDF_ndims(VALUE file)
   return Integer;
 }
 
-VALUE 
+VALUE
 NetCDF_nvars(VALUE file)
 {
   int ncid;
@@ -1108,7 +1098,7 @@ NetCDF_nvars(VALUE file)
   return Integer;
 }
 
-VALUE 
+VALUE
 NetCDF_natts(VALUE file)
 {
   int ncid;
@@ -1139,10 +1129,10 @@ NetCDF_unlimited(VALUE file)
   ncid=ncfile->ncid;
   status=nc_inq_unlimdim(ncid,&unlimdimidp);
   if(status !=NC_NOERR) NC_RAISE(status);
-  
+
   Netcdf_dim = NetCDF_dim_init(ncid,unlimdimidp);
-  
-  /* If unlimdimidp=-1,No unlimited dimension is defined in the netCDF dataset */ 
+
+  /* If unlimdimidp=-1,No unlimited dimension is defined in the netCDF dataset */
   if(unlimdimidp != -1)
     {
       Dimension = Data_Wrap_Struct(cNetCDFDim,0,NetCDF_dim_free,Netcdf_dim);
@@ -1153,7 +1143,31 @@ NetCDF_unlimited(VALUE file)
       return Qnil;
     }
 }
-			       
+
+#if NCVER >= 400
+
+VALUE
+NetCDF_format(VALUE file)
+{
+  int ncid;
+  int formatp;
+  int status;
+  VALUE Integer;
+  struct Netcdf *ncfile;
+
+  Data_Get_Struct(file,struct Netcdf,ncfile);
+  ncid=ncfile->ncid;
+  status=nc_inq_format(ncid,&formatp);
+  if(status != NC_NOERR) NC_RAISE (status);
+  Integer = INT2NUM(formatp);
+  /* one of NC_FORMAT_CLASSIC (1), NC_FORMAT_64BIT (2), NC_FORMAT_NETCDF4 (3),
+     NC_FORMAT_NETCDF4_CLASSIC (4)
+   */
+  return Integer;
+}
+
+#endif
+
 VALUE
 NetCDF_sync(VALUE file)
 {
@@ -1161,7 +1175,6 @@ NetCDF_sync(VALUE file)
   int status;
   struct Netcdf *ncfile;
 
-  rb_secure(3);
   Data_Get_Struct(file,struct Netcdf,ncfile);
   ncid=ncfile->ncid;
   status = nc_sync(ncid);
@@ -1174,7 +1187,7 @@ NetCDF_path(VALUE file)
 {
   char *path;
   struct Netcdf *ncfile;
-  
+
   Data_Get_Struct(file,struct Netcdf,ncfile);
   path=ncfile->name;
   return(rb_str_new2(path));
@@ -1188,14 +1201,14 @@ NetCDF_dim_length(VALUE Dim)
   int dimid;
   size_t lengthp;
   struct NetCDFDim *Netcdf_dim;
-  
+
   Data_Get_Struct(Dim,struct NetCDFDim,Netcdf_dim);
   ncid=Netcdf_dim->ncid;
   dimid=Netcdf_dim->dimid;
 
   status = nc_inq_dimlen(ncid,dimid,&lengthp);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   return(INT2NUM(lengthp));
 }
 
@@ -1207,8 +1220,7 @@ NetCDF_dim_name(VALUE Dim,VALUE dimension_newname)
   int dimid;
   char *c_dim_name;
   struct NetCDFDim *Netcdf_dim;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Dim,struct NetCDFDim,Netcdf_dim);
   ncid=Netcdf_dim->ncid;
   dimid=Netcdf_dim->dimid;
@@ -1217,7 +1229,7 @@ NetCDF_dim_name(VALUE Dim,VALUE dimension_newname)
 
   status = nc_rename_dim(ncid,dimid,c_dim_name);
   if(status !=NC_NOERR) NC_RAISE(status);
-  
+
   return Qnil;
 }
 
@@ -1230,14 +1242,14 @@ NetCDF_dim_inqname(VALUE Dim)
   char c_dim_name[NC_MAX_NAME];
   struct NetCDFDim *Netcdf_dim;
   VALUE str;
-  
+
   Data_Get_Struct(Dim,struct NetCDFDim,Netcdf_dim);
   ncid=Netcdf_dim->ncid;
   dimid=Netcdf_dim->dimid;
-  
+
   status = nc_inq_dimname(ncid,dimid,c_dim_name);
   if(status !=NC_NOERR) NC_RAISE(status);
-  
+
   str = rb_str_new2(c_dim_name);
   OBJ_TAINT(str);
   return(str);
@@ -1249,7 +1261,7 @@ NetCDF_dim_whether_unlimited(VALUE Dim)
   int status;
   int uldid;
   struct NetCDFDim *Netcdf_dim;
-  
+
   Data_Get_Struct(Dim,struct NetCDFDim,Netcdf_dim);
   status=nc_inq_unlimdim(Netcdf_dim->ncid,&uldid);
   if(status !=NC_NOERR) NC_RAISE(status);
@@ -1269,7 +1281,7 @@ NetCDF_att_inq_name(VALUE Att)
 
   Data_Get_Struct(Att,struct NetCDFAtt,Netcdf_att);
   c_att_name=Netcdf_att->name;
-  
+
   str = rb_str_new2(c_att_name);
   OBJ_TAINT(str);
   return(str);
@@ -1287,16 +1299,16 @@ NetCDF_att_rename(VALUE Att,VALUE new_att_name)
   Data_Get_Struct(Att,struct NetCDFAtt,Netcdf_att);
   ncid=Netcdf_att->ncid;
   varid=Netcdf_att->varid;
-  
+
   c_att_name=Netcdf_att->name;
-  
+
   Check_Type(new_att_name,T_STRING);
   SafeStringValue(new_att_name);
   c_new_att_name=StringValueCStr(new_att_name);
-  
+
   status = nc_rename_att(ncid,varid,c_att_name,c_new_att_name);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   strcpy(Netcdf_att->name,c_new_att_name);
   return Qnil;
 }
@@ -1327,7 +1339,7 @@ NetCDF_id2var(VALUE file,VALUE varid)
   struct Netcdf *ncfile;
   struct NetCDFVar *Netcdf_var;
   VALUE Var;
-  
+
   Data_Get_Struct(file,struct Netcdf,ncfile);
   ncid=ncfile->ncid;
   Check_Type(varid,T_FIXNUM);
@@ -1349,7 +1361,7 @@ NetCDF_id2att(VALUE file,VALUE attnum)
   char *c_att_name;
   VALUE Att;
   c_att_name=ALLOCA_N(char,NC_MAX_NAME);
-  
+
   Data_Get_Struct(file,struct Netcdf,ncfile);
   ncid=ncfile->ncid;
 
@@ -1377,7 +1389,7 @@ NetCDF_var_deflate(int argc, VALUE *argv, VALUE Var)
   struct NetCDFVar *Netcdf_var;
 
   int shuffle;
-    /* If non-zero, turn on the shuffle filter. 
+    /* If non-zero, turn on the shuffle filter.
 
        http://www.unidata.ucar.edu/software/netcdf/papers/AMS_2008.pdf :
        The shuffle algorithm changes the byte order in the data stream;
@@ -1397,7 +1409,7 @@ NetCDF_var_deflate(int argc, VALUE *argv, VALUE Var)
            level specified by the deflate_level parameter.
          */
 
-  if (argc>2 || argc<1) rb_raise(rb_eArgError, 
+  if (argc>2 || argc<1) rb_raise(rb_eArgError,
 		         "wrong # of arguments (%d). It must be 1 or 2", argc);
 
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
@@ -1433,7 +1445,7 @@ NetCDF_var_deflate_params(VALUE Var)
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
-  status = nc_inq_var_deflate(ncid, varid, &shufflep, &deflatep, 
+  status = nc_inq_var_deflate(ncid, varid, &shufflep, &deflatep,
 			      &deflate_levelp);
   if(status != NC_NOERR) NC_RAISE(status);
   if (shufflep==0) {sh=Qfalse;} else {sh=Qtrue;}
@@ -1484,7 +1496,7 @@ NetCDF_var_id2att(VALUE Var,VALUE attnum)
   struct NetCDFAtt *Netcdf_att;
   char *c_att_name;
   VALUE Att;
-  
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   c_varid=Netcdf_var->varid;
@@ -1496,7 +1508,7 @@ NetCDF_var_id2att(VALUE Var,VALUE attnum)
 
   status = nc_inq_attname(ncid,c_varid,c_attnum,c_att_name);
   if(status != NC_NOERR) NC_RAISE(status);
- 
+
   Netcdf_att=NetCDF_att_init(ncid,c_varid,c_att_name);
   Att=Data_Wrap_Struct(cNetCDFAtt,0,Netcdf_att_free,Netcdf_att);
   return(Att);
@@ -1521,7 +1533,7 @@ NetCDF_var_dims(VALUE Var)
   Dims = rb_ary_new();
   for(i=0;i<ndims;i++){
       Netcdf_dim = NetCDF_dim_init(ncid,dimids[ndims-1-i]);
-      rb_ary_push(Dims, 
+      rb_ary_push(Dims,
 		  Data_Wrap_Struct(cNetCDFDim,0,NetCDF_dim_free,Netcdf_dim));
   }
   return(Dims);
@@ -1565,7 +1577,6 @@ NetCDF_att_copy(VALUE Att,VALUE Var_or_File)
   struct Netcdf    *ncfile;
   struct NetCDFAtt *Netcdf_att_out;
 
-  rb_secure(3);
   Data_Get_Struct(Att,struct NetCDFAtt,Netcdf_att);
   ncid_in=Netcdf_att->ncid;
   varid_in=Netcdf_att->varid;
@@ -1611,7 +1622,7 @@ NetCDF_att_atttype(VALUE Att)
   Attname = nctype2natype(xtypep);
   return(rb_str_new2(Attname));
 }
-  
+
 VALUE
 NetCDF_att_typecode(VALUE Att)
 {
@@ -1629,10 +1640,10 @@ NetCDF_att_typecode(VALUE Att)
 
   status = nc_inq_atttype(ncid,varid,att_name,&xtypep);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   return(INT2NUM(nctype2natypecode(xtypep)));
 }
-  
+
 VALUE
 NetCDF_att_delete(VALUE Att)
 {
@@ -1642,7 +1653,6 @@ NetCDF_att_delete(VALUE Att)
   char *c_att_name;
   struct NetCDFAtt *Netcdf_att;
 
-  rb_secure(3);
   Data_Get_Struct(Att,struct NetCDFAtt,Netcdf_att);
 
   ncid=Netcdf_att->ncid;
@@ -1651,7 +1661,7 @@ NetCDF_att_delete(VALUE Att)
 
   status = nc_del_att(ncid,varid,c_att_name);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   return Qnil;
 }
 
@@ -1663,13 +1673,12 @@ NetCDF_att_put(VALUE Att,VALUE value,VALUE atttype)
       */
 {
   struct NetCDFAtt *ncatt;
- 
-  rb_secure(3);
+
   Data_Get_Struct(Att,struct NetCDFAtt,ncatt);
-  return( NetCDF_put_att__(ncatt->ncid, ncatt->name, value, 
+  return( NetCDF_put_att__(ncatt->ncid, ncatt->name, value,
 			   atttype, ncatt->varid) );
 }
-  
+
 VALUE
 NetCDF_att_get(VALUE Att)
 {
@@ -1716,7 +1725,7 @@ NetCDF_att_get(VALUE Att)
 
     attlen[0]=lenp;
     Cbyte_to_NArray(NArray,1,attlen,up);
-  
+
     status = nc_get_att_uchar(ncid,varid,c_attname,up);
     if(status != NC_NOERR) NC_RAISE(status);
 
@@ -1729,7 +1738,7 @@ NetCDF_att_get(VALUE Att)
 
     attlen[0]=lenp;
     Csint_to_NArray(NArray,1,attlen,sp);
-    
+
     status = nc_get_att_short(ncid,varid,c_attname,sp);
     if(status != NC_NOERR) NC_RAISE(status);
     OBJ_TAINT(NArray);
@@ -1738,10 +1747,10 @@ NetCDF_att_get(VALUE Att)
   case NC_INT:
     status = nc_inq_attlen(ncid,varid,c_attname,&lenp);
     if(status != NC_NOERR) NC_RAISE(status);
-    
+
     attlen[0]=lenp;
     Clint_to_NArray(NArray,1,attlen,ip);
-    
+
     status = nc_get_att_int(ncid,varid,c_attname,ip);
     if(status != NC_NOERR) NC_RAISE(status);
 
@@ -1754,7 +1763,7 @@ NetCDF_att_get(VALUE Att)
 
     attlen[0]=lenp;
     Cfloat_to_NArray(NArray,1,attlen,fp);
-    
+
     status = nc_get_att_float(ncid,varid,c_attname,fp);
     if(status != NC_NOERR) NC_RAISE(status);
 
@@ -1767,7 +1776,7 @@ NetCDF_att_get(VALUE Att)
 
     attlen[0]=lenp;
     Cdouble_to_NArray(NArray,1,attlen,dp);
-    
+
     status = nc_get_att_double(ncid,varid,c_attname,dp);
     if(status != NC_NOERR) NC_RAISE(status);
     OBJ_TAINT(NArray);
@@ -1779,7 +1788,7 @@ NetCDF_att_get(VALUE Att)
   return Qnil;
 }
 
-		  
+
 VALUE
 NetCDF_var_inq_name(VALUE Var)
 {
@@ -1796,7 +1805,7 @@ NetCDF_var_inq_name(VALUE Var)
   varid=Netcdf_var->varid;
   status = nc_inq_varname(ncid,varid,c_var_name);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Var_name=rb_str_new2(c_var_name);
   OBJ_TAINT(Var_name);
   return Var_name;
@@ -1813,7 +1822,7 @@ NetCDF_var_ndims(VALUE Var)
   VALUE Var_ndims;
 
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
-  
+
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   status = nc_inq_varndims(ncid,varid,&ndimsp);
@@ -1831,15 +1840,15 @@ NetCDF_var_vartype(VALUE Var)
   nc_type xtypep;
   struct NetCDFVar *Netcdf_var;
   const char *Vartype;
-  
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
-  
+
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
 
   status = nc_inq_vartype(ncid,varid,&xtypep);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Vartype=nctype2natype(xtypep);
   return(rb_str_new2(Vartype));
 }
@@ -1852,19 +1861,19 @@ NetCDF_var_typecode(VALUE Var)
   int varid;
   nc_type xtypep;
   struct NetCDFVar *Netcdf_var;
-  
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
-  
+
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
 
   status = nc_inq_vartype(ncid,varid,&xtypep);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   return(INT2NUM(nctype2natypecode(xtypep)));
 }
 
- 
+
 VALUE
 NetCDF_var_natts(VALUE Var)
 {
@@ -1874,16 +1883,16 @@ NetCDF_var_natts(VALUE Var)
   int nattsp;
   struct NetCDFVar *Netcdf_var;
   VALUE Var_natts;
-  
+
 
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
-  
+
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
-  
+
   status= nc_inq_varnatts(ncid,varid,&nattsp);
   if(status !=NC_NOERR) NC_RAISE(status);
-  
+
   Var_natts=INT2FIX(nattsp);
   return Var_natts;
 }
@@ -1894,7 +1903,7 @@ NetCDF_var_file(VALUE Var)
   struct NetCDFVar *Netcdf_var;
   /* VALUE file; */
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
-  
+
   return (Netcdf_var->file);
 }
 
@@ -1906,15 +1915,14 @@ NetCDF_var_rename(VALUE Var,VALUE var_new_name)
   int varid;
   char *c_var_new_name;
   struct NetCDFVar *Netcdf_var;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
 
   Check_Type(var_new_name,T_STRING);
   c_var_new_name=StringValueCStr(var_new_name);
-  
+
   status = nc_rename_var(ncid,varid,c_var_new_name);
   if(status !=NC_NOERR) NC_RAISE(status);
 
@@ -1934,13 +1942,13 @@ NetCDF_var_att(VALUE Var,VALUE att_name)
   VALUE Att;
 
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
-  
+
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
 
   Check_Type(att_name,T_STRING);
   c_att_name=StringValueCStr(att_name);
-  
+
   status = nc_inq_attid(ncid,varid,c_att_name,&c_attnump);
   if(status == NC_NOERR){
     Netcdf_att=NetCDF_att_init(ncid,varid,c_att_name);
@@ -1958,17 +1966,17 @@ NetCDF_var_att(VALUE Var,VALUE att_name)
 
 /* Redifinition of the "==" and "eql?" methods */
 
-VALUE 
+VALUE
 NetCDF_eql(VALUE filea,VALUE fileb)
 {
   struct Netcdf *ncfilea;
   struct Netcdf *ncfileb;
-  
+
   if( rb_obj_is_kind_of(fileb, cNetCDF) ){
       Data_Get_Struct(filea,struct Netcdf,ncfilea);
       Data_Get_Struct(fileb,struct Netcdf,ncfileb);
-    
-      if(ncfilea->ncid == ncfileb->ncid && 
+
+      if(ncfilea->ncid == ncfileb->ncid &&
 	 strcmp(ncfilea->name,ncfileb->name)==0){
 	  return Qtrue;
       } else {
@@ -1984,12 +1992,12 @@ NetCDF_var_eql(VALUE Vara,VALUE Varb)
 {
   struct NetCDFVar *Netcdf_vara;
   struct NetCDFVar *Netcdf_varb;
-  
+
   if( rb_obj_is_kind_of(Varb, cNetCDFVar) ){
       Data_Get_Struct(Vara,struct NetCDFVar,Netcdf_vara);
       Data_Get_Struct(Varb,struct NetCDFVar,Netcdf_varb);
 
-      if(Netcdf_vara->ncid == Netcdf_varb->ncid && 
+      if(Netcdf_vara->ncid == Netcdf_varb->ncid &&
 	 Netcdf_vara->varid == Netcdf_varb->varid){
 	  return Qtrue;
       } else {
@@ -2000,7 +2008,7 @@ NetCDF_var_eql(VALUE Vara,VALUE Varb)
   }
 }
 
-VALUE 
+VALUE
 NetCDF_dim_eql(VALUE Dima,VALUE Dimb)
 {
   struct NetCDFDim *Netcdf_dima;
@@ -2009,8 +2017,8 @@ NetCDF_dim_eql(VALUE Dima,VALUE Dimb)
   if( rb_obj_is_kind_of(Dimb, cNetCDFDim) ){
       Data_Get_Struct(Dima,struct NetCDFDim,Netcdf_dima);
       Data_Get_Struct(Dimb,struct NetCDFDim,Netcdf_dimb);
-  
-      if(Netcdf_dima->ncid == Netcdf_dimb->ncid && 
+
+      if(Netcdf_dima->ncid == Netcdf_dimb->ncid &&
 	 Netcdf_dima->dimid == Netcdf_dimb->dimid){
 	  return Qtrue;
       } else {
@@ -2026,16 +2034,16 @@ NetCDF_att_eql(VALUE Atta,VALUE Attb)
 {
   struct NetCDFAtt *Netcdf_atta;
   struct NetCDFAtt *Netcdf_attb;
-  
+
   if( rb_obj_is_kind_of(Attb, cNetCDFAtt) ){
       Data_Get_Struct(Atta,struct NetCDFAtt,Netcdf_atta);
       Data_Get_Struct(Attb,struct NetCDFAtt,Netcdf_attb);
-  
-      if(Netcdf_atta->ncid == Netcdf_atta->ncid && 
-	 Netcdf_atta->varid == Netcdf_attb->varid && 
+
+      if(Netcdf_atta->ncid == Netcdf_atta->ncid &&
+	 Netcdf_atta->varid == Netcdf_attb->varid &&
 	 strcmp(Netcdf_atta->name,Netcdf_attb->name)==0){
 	  return Qtrue;
-      } else { 
+      } else {
 	  return Qfalse;
       }
   } else {
@@ -2080,7 +2088,7 @@ NetCDF_get_var_char(VALUE Var)
   }
 
   Cbyte_to_NArray(NArray,ndimsp,shape,ptr);
-  
+
   status = nc_get_var_text(ncid,varid,(char *)ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2124,7 +2132,7 @@ NetCDF_get_var_byte(VALUE Var)
   }
 
   Cbyte_to_NArray(NArray,ndimsp,shape,ptr);
-  
+
   status = nc_get_var_uchar(ncid,varid,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2168,7 +2176,7 @@ NetCDF_get_var_sint(VALUE Var)
   }
 
   Csint_to_NArray(NArray,ndimsp,shape,ptr);
-  
+
   status = nc_get_var_short(ncid,varid,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2212,7 +2220,7 @@ NetCDF_get_var_int(VALUE Var)
   }
 
   Clint_to_NArray(NArray,ndimsp,shape,ptr);
-  
+
   status = nc_get_var_int(ncid,varid,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2300,7 +2308,7 @@ NetCDF_get_var_double(VALUE Var)
   }
 
   Cdouble_to_NArray(NArray,ndimsp,shape,ptr);
-  
+
   status = nc_get_var_double(ncid,varid,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2308,7 +2316,7 @@ NetCDF_get_var_double(VALUE Var)
   return NArray;
 }
 
-VALUE 
+VALUE
 NetCDF_get_var1_char(VALUE Var,VALUE start)
 {
   int ncid;
@@ -2325,7 +2333,7 @@ NetCDF_get_var1_char(VALUE Var,VALUE start)
   na_shape_t *c_count;
   VALUE NArray;
 
-  
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
@@ -2334,12 +2342,12 @@ NetCDF_get_var1_char(VALUE Var,VALUE start)
   if(ndims == 0) {
     rb_raise(rb_eNetcdfError,"Cannot specify a subset of a rank-0 scalar\n");
   }
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
   }
-  
+
   c_start=ALLOCA_N(size_t,ndims);
   c_count=ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
@@ -2352,13 +2360,13 @@ NetCDF_get_var1_char(VALUE Var,VALUE start)
       l_start += dimlen;
     }
     c_start[i]=l_start;
-    
+
     c_count[i]=1;
   }
-  
-  
-  
-  
+
+
+
+
   Cbyte_to_NArray(NArray,ndims,c_count,ptr);
   status = nc_get_var1_text(ncid,varid,c_start,(char *)ptr);
   if(status != NC_NOERR) NC_RAISE(status);
@@ -2368,7 +2376,7 @@ NetCDF_get_var1_char(VALUE Var,VALUE start)
 
 }
 
-VALUE 
+VALUE
 NetCDF_get_var1_byte(VALUE Var,VALUE start)
 {
   int ncid;
@@ -2385,7 +2393,7 @@ NetCDF_get_var1_byte(VALUE Var,VALUE start)
   na_shape_t *c_count;
   VALUE NArray;
 
-  
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
@@ -2394,12 +2402,12 @@ NetCDF_get_var1_byte(VALUE Var,VALUE start)
   if(ndims == 0) {
     rb_raise(rb_eNetcdfError,"Cannot specify a subset of a rank-0 scalar\n");
   }
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
   }
-  
+
   c_start=ALLOCA_N(size_t,ndims);
   c_count=ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
@@ -2412,13 +2420,13 @@ NetCDF_get_var1_byte(VALUE Var,VALUE start)
       l_start += dimlen;
     }
     c_start[i]=l_start;
-    
+
     c_count[i]=1;
   }
-  
-  
-  
-  
+
+
+
+
   Cbyte_to_NArray(NArray,ndims,c_count,ptr);
   status = nc_get_var1_uchar(ncid,varid,c_start,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
@@ -2428,7 +2436,7 @@ NetCDF_get_var1_byte(VALUE Var,VALUE start)
 
 }
 
-VALUE 
+VALUE
 NetCDF_get_var1_sint(VALUE Var,VALUE start)
 {
   int ncid;
@@ -2453,12 +2461,12 @@ NetCDF_get_var1_sint(VALUE Var,VALUE start)
   if(ndims == 0) {
     rb_raise(rb_eNetcdfError,"Cannot specify a subset of a rank-0 scalar\n");
   }
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
   }
-  
+
   c_start=ALLOCA_N(size_t,ndims);
   c_count=ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
@@ -2473,9 +2481,9 @@ NetCDF_get_var1_sint(VALUE Var,VALUE start)
     c_start[i]=l_start;
     c_count[i]=1;
   }
-  
+
   Csint_to_NArray(NArray,ndims,c_count,ptr);
-  
+
   status = nc_get_var1_short(ncid,varid,c_start,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2484,7 +2492,7 @@ NetCDF_get_var1_sint(VALUE Var,VALUE start)
 
 }
 
-VALUE 
+VALUE
 NetCDF_get_var1_int(VALUE Var,VALUE start)
 {
   int ncid;
@@ -2509,12 +2517,12 @@ NetCDF_get_var1_int(VALUE Var,VALUE start)
   if(ndims == 0) {
     rb_raise(rb_eNetcdfError,"Cannot specify a subset of a rank-0 scalar\n");
   }
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
   }
-  
+
   c_start=ALLOCA_N(size_t,ndims);
   c_count=ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
@@ -2529,9 +2537,9 @@ NetCDF_get_var1_int(VALUE Var,VALUE start)
     c_start[i]=l_start;
     c_count[i]=1;
   }
-  
+
   Clint_to_NArray(NArray,ndims,c_count,ptr);
-  
+
   status = nc_get_var1_int(ncid,varid,c_start,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2540,7 +2548,7 @@ NetCDF_get_var1_int(VALUE Var,VALUE start)
 
 }
 
-VALUE 
+VALUE
 NetCDF_get_var1_float(VALUE Var,VALUE start)
 {
   int ncid;
@@ -2565,12 +2573,12 @@ NetCDF_get_var1_float(VALUE Var,VALUE start)
   if(ndims == 0) {
     rb_raise(rb_eNetcdfError,"Cannot specify a subset of a rank-0 scalar\n");
   }
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
   }
-  
+
   c_start=ALLOCA_N(size_t,ndims);
   c_count=ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
@@ -2585,9 +2593,9 @@ NetCDF_get_var1_float(VALUE Var,VALUE start)
     c_start[i]=l_start;
     c_count[i]=1;
   }
-  
+
   Cfloat_to_NArray(NArray,ndims,c_count,ptr);
-  
+
   status = nc_get_var1_float(ncid,varid,c_start,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2596,7 +2604,7 @@ NetCDF_get_var1_float(VALUE Var,VALUE start)
 
 }
 
-VALUE 
+VALUE
 NetCDF_get_var1_double(VALUE Var,VALUE start)
 {
   int ncid;
@@ -2621,12 +2629,12 @@ NetCDF_get_var1_double(VALUE Var,VALUE start)
   if(ndims == 0) {
     rb_raise(rb_eNetcdfError,"Cannot specify a subset of a rank-0 scalar\n");
   }
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
   }
-  
+
   c_start=ALLOCA_N(size_t,ndims);
   c_count=ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
@@ -2641,9 +2649,9 @@ NetCDF_get_var1_double(VALUE Var,VALUE start)
     c_start[i]=l_start;
     c_count[i]=1;
   }
-  
+
   Cdouble_to_NArray(NArray,ndims,c_count,ptr);
-  
+
   status = nc_get_var1_double(ncid,varid,c_start,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2674,7 +2682,7 @@ NetCDF_get_vars_char(VALUE Var,VALUE start,VALUE end,VALUE stride)
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
-  
+
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
   if(ndims == 0) {
@@ -2684,7 +2692,7 @@ NetCDF_get_vars_char(VALUE Var,VALUE start,VALUE end,VALUE stride)
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims){
     rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
@@ -2692,7 +2700,7 @@ NetCDF_get_vars_char(VALUE Var,VALUE start,VALUE end,VALUE stride)
   c_start = ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-   
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -2745,14 +2753,14 @@ NetCDF_get_vars_char(VALUE Var,VALUE start,VALUE end,VALUE stride)
     }
   }
 
-  
+
   shape = ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
     shape[ndims-1-i]=c_count[i];
   }
-  
+
   Cbyte_to_NArray(NArray,ndims,shape,ptr);
-  
+
   status = nc_get_vars_text(ncid,varid,c_start,c_count,c_stride,(char *)ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2782,7 +2790,7 @@ NetCDF_get_vars_byte(VALUE Var,VALUE start,VALUE end,VALUE stride)
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
-  
+
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
   if(ndims == 0) {
@@ -2792,7 +2800,7 @@ NetCDF_get_vars_byte(VALUE Var,VALUE start,VALUE end,VALUE stride)
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims){
     rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
@@ -2800,7 +2808,7 @@ NetCDF_get_vars_byte(VALUE Var,VALUE start,VALUE end,VALUE stride)
   c_start = ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-   
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -2853,14 +2861,14 @@ NetCDF_get_vars_byte(VALUE Var,VALUE start,VALUE end,VALUE stride)
     }
   }
 
-  
+
   shape = ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
     shape[ndims-1-i]=c_count[i];
   }
-  
+
   Cbyte_to_NArray(NArray,ndims,shape,ptr);
-  
+
   status = nc_get_vars_uchar(ncid,varid,c_start,c_count,c_stride,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -2890,7 +2898,7 @@ NetCDF_get_vars_sint(VALUE Var,VALUE start,VALUE end,VALUE stride)
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
-  
+
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
   if(ndims == 0) {
@@ -2900,7 +2908,7 @@ NetCDF_get_vars_sint(VALUE Var,VALUE start,VALUE end,VALUE stride)
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims){
     rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
@@ -2908,7 +2916,7 @@ NetCDF_get_vars_sint(VALUE Var,VALUE start,VALUE end,VALUE stride)
   c_start = ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-   
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -2960,19 +2968,19 @@ NetCDF_get_vars_sint(VALUE Var,VALUE start,VALUE end,VALUE stride)
       c_count[i]=(l_end-c_start[i])/c_stride[i]+1;
     }
   }
-  
-  
+
+
   shape = ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
     shape[ndims-1-i]=c_count[i];
   }
 
   Csint_to_NArray(NArray,ndims,shape,ptr);
-  
+
 
   status = nc_get_vars_short(ncid,varid,c_start,c_count,c_stride,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   OBJ_TAINT(NArray);
   return NArray;
 }
@@ -2999,7 +3007,7 @@ NetCDF_get_vars_int(VALUE Var,VALUE start,VALUE end,VALUE stride)
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
-  
+
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
   if(ndims == 0) {
@@ -3009,7 +3017,7 @@ NetCDF_get_vars_int(VALUE Var,VALUE start,VALUE end,VALUE stride)
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims){
     rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
@@ -3017,7 +3025,7 @@ NetCDF_get_vars_int(VALUE Var,VALUE start,VALUE end,VALUE stride)
   c_start = ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-   
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3070,14 +3078,14 @@ NetCDF_get_vars_int(VALUE Var,VALUE start,VALUE end,VALUE stride)
     }
   }
 
-  
+
   shape = ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
     shape[ndims-1-i]=c_count[i];
   }
 
   Clint_to_NArray(NArray,ndims,shape,ptr);
-  
+
 
   status = nc_get_vars_int(ncid,varid,c_start,c_count,c_stride,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
@@ -3108,7 +3116,7 @@ NetCDF_get_vars_float(VALUE Var,VALUE start,VALUE end,VALUE stride)
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
-  
+
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
   if(ndims == 0) {
@@ -3118,7 +3126,7 @@ NetCDF_get_vars_float(VALUE Var,VALUE start,VALUE end,VALUE stride)
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims){
     rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
@@ -3126,7 +3134,7 @@ NetCDF_get_vars_float(VALUE Var,VALUE start,VALUE end,VALUE stride)
   c_start = ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-   
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3178,16 +3186,16 @@ NetCDF_get_vars_float(VALUE Var,VALUE start,VALUE end,VALUE stride)
       c_count[i]=(l_end-c_start[i])/c_stride[i]+1;
     }
   }
-  
+
 
   shape = ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
     shape[ndims-1-i]=c_count[i];
   }
-  
+
   Cfloat_to_NArray(NArray,ndims,shape,ptr);
-  
-  
+
+
   status = nc_get_vars_float(ncid,varid,c_start,c_count,c_stride,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -3217,7 +3225,7 @@ NetCDF_get_vars_double(VALUE Var,VALUE start,VALUE end,VALUE stride)
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid = Netcdf_var->ncid;
   varid = Netcdf_var->varid;
-  
+
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
   if(ndims == 0) {
@@ -3227,7 +3235,7 @@ NetCDF_get_vars_double(VALUE Var,VALUE start,VALUE end,VALUE stride)
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims){
     rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
@@ -3235,7 +3243,7 @@ NetCDF_get_vars_double(VALUE Var,VALUE start,VALUE end,VALUE stride)
   c_start = ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-   
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3287,15 +3295,15 @@ NetCDF_get_vars_double(VALUE Var,VALUE start,VALUE end,VALUE stride)
       c_count[i]=(l_end-c_start[i])/c_stride[i]+1;
     }
   }
-  
+
 
   shape = ALLOCA_N(na_shape_t,ndims);
   for(i=0;i<ndims;i++){
     shape[ndims-1-i]=c_count[i];
   }
-  
+
   Cdouble_to_NArray(NArray,ndims,shape,ptr);
-  
+
   status = nc_get_vars_double(ncid,varid,c_start,c_count,c_stride,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
 
@@ -3319,13 +3327,12 @@ NetCDF_put_var_char(VALUE Var,VALUE NArray)
   size_t lengthp;
   char *var_name;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
 
   Array_to_Cbyte_len(NArray,ptr,len);
-  
+
   status = nc_inq_varndims(ncid,varid,&ndimsp);
   if(status != NC_NOERR) NC_RAISE(status);
   for(i=0;i<ndimsp;i++){
@@ -3364,13 +3371,12 @@ NetCDF_put_var_byte(VALUE Var,VALUE NArray)
   size_t lengthp;
   char *var_name;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
 
   Array_to_Cbyte_len(NArray,ptr,len);
-  
+
   status = nc_inq_varndims(ncid,varid,&ndimsp);
   if(status != NC_NOERR) NC_RAISE(status);
   for(i=0;i<ndimsp;i++){
@@ -3409,12 +3415,11 @@ NetCDF_put_var_short(VALUE Var,VALUE NArray)
   size_t lengthp;
   char *var_name;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   Array_to_Csint_len(NArray,ptr,len);
-  
+
   status = nc_inq_varndims(ncid,varid,&ndimsp);
   if(status != NC_NOERR) NC_RAISE(status);
   for(i=0;i<ndimsp;i++){
@@ -3454,7 +3459,6 @@ NetCDF_put_var_int(VALUE Var,VALUE NArray)
   size_t lengthp;
   char *var_name;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -3479,8 +3483,8 @@ NetCDF_put_var_int(VALUE Var,VALUE NArray)
     if(status != NC_NOERR) NC_RAISE(status);
     rb_raise(rb_eNetcdfError,"Length of NArray don't equal to length of total array length in the '%s'\n",var_name);
   }
-  
-  
+
+
   status = nc_put_var_int(ncid,varid,ptr);
   if(status !=NC_NOERR) NC_RAISE(status);
   return Qnil;
@@ -3501,15 +3505,14 @@ NetCDF_put_var_float(VALUE Var,VALUE NArray)
   int dimids[NC_MAX_DIMS];
   size_t lengthp;
   char *var_name;
-  
-  
-  rb_secure(3);
+
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
 
   Array_to_Cfloat_len(NArray,ptr,len);
-  
+
   status = nc_inq_varndims(ncid,varid,&ndimsp);
   if(status != NC_NOERR) NC_RAISE(status);
   for(i=0;i<ndimsp;i++){
@@ -3550,7 +3553,6 @@ NetCDF_put_var_double(VALUE Var,VALUE NArray)
   char *var_name;
 
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -3595,19 +3597,18 @@ NetCDF_put_var1_char(VALUE Var,VALUE NArray,VALUE start)
   int ndims;
   int   *dimids;
   size_t dimlen;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
 
-  
+
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) <ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
@@ -3616,7 +3617,7 @@ NetCDF_put_var1_char(VALUE Var,VALUE NArray,VALUE start)
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0;i<ndims;i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid,dimids[i],&dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3646,19 +3647,18 @@ NetCDF_put_var1_byte(VALUE Var,VALUE NArray,VALUE start)
   int ndims;
   int   *dimids;
   size_t dimlen;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
 
-  
+
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) <ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
@@ -3667,7 +3667,7 @@ NetCDF_put_var1_byte(VALUE Var,VALUE NArray,VALUE start)
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0;i<ndims;i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid,dimids[i],&dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3697,19 +3697,18 @@ NetCDF_put_var1_sint(VALUE Var,VALUE NArray,VALUE start)
   int ndims;
   int   *dimids;
   size_t dimlen;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
 
-  
+
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) <ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
@@ -3718,7 +3717,7 @@ NetCDF_put_var1_sint(VALUE Var,VALUE NArray,VALUE start)
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0;i<ndims;i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid,dimids[i],&dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3747,19 +3746,18 @@ NetCDF_put_var1_int(VALUE Var,VALUE NArray,VALUE start)
   int ndims;
   int   *dimids;
   size_t dimlen;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
 
-  
+
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) <ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
@@ -3768,7 +3766,7 @@ NetCDF_put_var1_int(VALUE Var,VALUE NArray,VALUE start)
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0;i<ndims;i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid,dimids[i],&dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3798,19 +3796,18 @@ NetCDF_put_var1_float(VALUE Var,VALUE NArray,VALUE start)
   int ndims;
   int   *dimids;
   size_t dimlen;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
 
-  
+
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) <ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
@@ -3819,7 +3816,7 @@ NetCDF_put_var1_float(VALUE Var,VALUE NArray,VALUE start)
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0;i<ndims;i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid,dimids[i],&dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3849,19 +3846,18 @@ NetCDF_put_var1_double(VALUE Var,VALUE NArray,VALUE start)
   int ndims;
   int   *dimids;
   size_t dimlen;
-  
-  rb_secure(3);
+
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
   status = nc_inq_varndims(ncid,varid,&ndims);
   if(status != NC_NOERR) NC_RAISE(status);
 
-  
+
   dimids = ALLOCA_N(int,ndims);
   status = nc_inq_vardimid(ncid,varid,dimids);
   if(status != NC_NOERR) NC_RAISE(status);
-  
+
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) <ndims) {
     rb_raise(rb_eNetcdfError,"Length of 'start' is too short\n");
@@ -3870,7 +3866,7 @@ NetCDF_put_var1_double(VALUE Var,VALUE NArray,VALUE start)
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0;i<ndims;i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
       status = nc_inq_dimlen(ncid,dimids[i],&dimlen);
       if(status != NC_NOERR) NC_RAISE(status);
@@ -3906,7 +3902,6 @@ NetCDF_put_vars_char(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   int   *dimids;
   size_t dimlen;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -3919,12 +3914,12 @@ NetCDF_put_vars_char(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
-      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n"); 
+      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
   }
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
 	status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
 	if(status != NC_NOERR) NC_RAISE(status);
@@ -3932,7 +3927,7 @@ NetCDF_put_vars_char(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
     }
     c_start[i]=l_start;
   }
-  
+
   c_stride=ALLOCA_N(ptrdiff_t,ndims);
   switch(TYPE(stride)){
   case T_NIL:
@@ -3943,12 +3938,12 @@ NetCDF_put_vars_char(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(stride,T_ARRAY);
       if(RARRAY_LEN(stride) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  c_stride[i]=NUM2INT(RARRAY_PTR(stride)[ndims-1-i]);
 	  if(c_stride[i]==0) {
-	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n"); 
+	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n");
 	  }
       }
   }
@@ -3966,7 +3961,7 @@ NetCDF_put_vars_char(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(end,T_ARRAY);
       if(RARRAY_LEN(end) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  l_end=NUM2INT(RARRAY_PTR(end)[ndims-1-i]);
@@ -3983,11 +3978,11 @@ NetCDF_put_vars_char(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 	  ptr = ALLOCA_N(unsigned char,c_count_all);
 	  for(i=0;i<c_count_all;i++){ptr[i]=scalar;}
       } else if(len != c_count_all) {
-	rb_raise(rb_eNetcdfError, 
-		 "lengh of the array does not agree with that of the subset\n"); 
-      } 
-  } 
-  
+	rb_raise(rb_eNetcdfError,
+		 "lengh of the array does not agree with that of the subset\n");
+      }
+  }
+
   status = nc_put_vars_text(ncid,varid,c_start,c_count,c_stride,(char *)ptr);
   if(status != NC_NOERR) NC_RAISE(status);
   return Qnil;
@@ -4012,7 +4007,6 @@ NetCDF_put_vars_byte(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   int   *dimids;
   size_t dimlen;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -4025,12 +4019,12 @@ NetCDF_put_vars_byte(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
-      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n"); 
+      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
   }
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
 	status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
 	if(status != NC_NOERR) NC_RAISE(status);
@@ -4038,7 +4032,7 @@ NetCDF_put_vars_byte(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
     }
     c_start[i]=l_start;
   }
-  
+
   c_stride=ALLOCA_N(ptrdiff_t,ndims);
   switch(TYPE(stride)){
   case T_NIL:
@@ -4049,12 +4043,12 @@ NetCDF_put_vars_byte(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(stride,T_ARRAY);
       if(RARRAY_LEN(stride) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  c_stride[i]=NUM2INT(RARRAY_PTR(stride)[ndims-1-i]);
 	  if(c_stride[i]==0) {
-	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n"); 
+	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n");
 	  }
       }
   }
@@ -4072,7 +4066,7 @@ NetCDF_put_vars_byte(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(end,T_ARRAY);
       if(RARRAY_LEN(end) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  l_end=NUM2INT(RARRAY_PTR(end)[ndims-1-i]);
@@ -4089,11 +4083,11 @@ NetCDF_put_vars_byte(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 	  ptr = ALLOCA_N(unsigned char,c_count_all);
 	  for(i=0;i<c_count_all;i++){ptr[i]=scalar;}
       } else if(len != c_count_all) {
-	rb_raise(rb_eNetcdfError, 
-		 "lengh of the array does not agree with that of the subset\n"); 
-      } 
-  } 
-  
+	rb_raise(rb_eNetcdfError,
+		 "lengh of the array does not agree with that of the subset\n");
+      }
+  }
+
   status = nc_put_vars_uchar(ncid,varid,c_start,c_count,c_stride,ptr);
   if(status != NC_NOERR) NC_RAISE(status);
   return Qnil;
@@ -4118,7 +4112,6 @@ NetCDF_put_vars_sint(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   int   *dimids;
   size_t dimlen;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -4131,12 +4124,12 @@ NetCDF_put_vars_sint(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
-      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n"); 
+      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
   }
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
 	status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
 	if(status != NC_NOERR) NC_RAISE(status);
@@ -4144,7 +4137,7 @@ NetCDF_put_vars_sint(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
     }
     c_start[i]=l_start;
   }
-  
+
   c_stride=ALLOCA_N(ptrdiff_t,ndims);
   switch(TYPE(stride)){
   case T_NIL:
@@ -4155,12 +4148,12 @@ NetCDF_put_vars_sint(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(stride,T_ARRAY);
       if(RARRAY_LEN(stride) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  c_stride[i]=NUM2INT(RARRAY_PTR(stride)[ndims-1-i]);
 	  if(c_stride[i]==0) {
-	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n"); 
+	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n");
 	  }
       }
   }
@@ -4178,7 +4171,7 @@ NetCDF_put_vars_sint(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(end,T_ARRAY);
       if(RARRAY_LEN(end) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  l_end=NUM2INT(RARRAY_PTR(end)[ndims-1-i]);
@@ -4195,8 +4188,8 @@ NetCDF_put_vars_sint(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 	  ptr = ALLOCA_N(short,c_count_all);
 	  for(i=0;i<c_count_all;i++){ptr[i]=scalar;}
       } else if(len != c_count_all) {
-	  rb_raise(rb_eNetcdfError, 
-              "lengh of the array does not agree with that of the subset\n"); 
+	  rb_raise(rb_eNetcdfError,
+              "lengh of the array does not agree with that of the subset\n");
       }
   }
 
@@ -4225,7 +4218,6 @@ NetCDF_put_vars_int(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   int   *dimids;
   size_t dimlen;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -4238,12 +4230,12 @@ NetCDF_put_vars_int(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
-      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n"); 
+      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
   }
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
 	status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
 	if(status != NC_NOERR) NC_RAISE(status);
@@ -4251,7 +4243,7 @@ NetCDF_put_vars_int(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
     }
     c_start[i]=l_start;
   }
-  
+
   c_stride=ALLOCA_N(ptrdiff_t,ndims);
   switch(TYPE(stride)){
   case T_NIL:
@@ -4262,12 +4254,12 @@ NetCDF_put_vars_int(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(stride,T_ARRAY);
       if(RARRAY_LEN(stride) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  c_stride[i]=NUM2INT(RARRAY_PTR(stride)[ndims-1-i]);
 	  if(c_stride[i]==0) {
-	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n"); 
+	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n");
 	  }
       }
   }
@@ -4285,7 +4277,7 @@ NetCDF_put_vars_int(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(end,T_ARRAY);
       if(RARRAY_LEN(end) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  l_end=NUM2INT(RARRAY_PTR(end)[ndims-1-i]);
@@ -4302,8 +4294,8 @@ NetCDF_put_vars_int(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 	  ptr = ALLOCA_N(int,c_count_all);
 	  for(i=0;i<c_count_all;i++){ptr[i]=scalar;}
       } else if(len != c_count_all) {
-	  rb_raise(rb_eNetcdfError, 
-              "length of the array does not agree with that of the subset\n"); 
+	  rb_raise(rb_eNetcdfError,
+              "length of the array does not agree with that of the subset\n");
       }
   }
 
@@ -4332,7 +4324,6 @@ NetCDF_put_vars_float(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   int   *dimids;
   size_t dimlen;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -4345,12 +4336,12 @@ NetCDF_put_vars_float(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
-      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n"); 
+      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
   }
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
 	status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
 	if(status != NC_NOERR) NC_RAISE(status);
@@ -4358,7 +4349,7 @@ NetCDF_put_vars_float(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
     }
     c_start[i]=l_start;
   }
-  
+
   c_stride=ALLOCA_N(ptrdiff_t,ndims);
   switch(TYPE(stride)){
   case T_NIL:
@@ -4369,12 +4360,12 @@ NetCDF_put_vars_float(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(stride,T_ARRAY);
       if(RARRAY_LEN(stride) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  c_stride[i]=NUM2INT(RARRAY_PTR(stride)[ndims-1-i]);
 	  if(c_stride[i]==0) {
-	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n"); 
+	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n");
 	  }
       }
   }
@@ -4392,7 +4383,7 @@ NetCDF_put_vars_float(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
   default:
       Check_Type(end,T_ARRAY);
       if(RARRAY_LEN(end) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  l_end=NUM2INT(RARRAY_PTR(end)[ndims-1-i]);
@@ -4409,8 +4400,8 @@ NetCDF_put_vars_float(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride)
 	  ptr = ALLOCA_N(float,c_count_all);
 	  for(i=0;i<c_count_all;i++){ptr[i]=scalar;}
       } else if(len != c_count_all) {
-	  rb_raise(rb_eNetcdfError, 
-              "lengh of the array does not agree with that of the subset\n"); 
+	  rb_raise(rb_eNetcdfError,
+              "lengh of the array does not agree with that of the subset\n");
       }
   }
 
@@ -4439,7 +4430,6 @@ NetCDF_put_vars_double(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride
   int   *dimids;
   size_t dimlen;
 
-  rb_secure(3);
   Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var);
   ncid=Netcdf_var->ncid;
   varid=Netcdf_var->varid;
@@ -4452,12 +4442,12 @@ NetCDF_put_vars_double(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride
 
   Check_Type(start,T_ARRAY);
   if(RARRAY_LEN(start) < ndims) {
-      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n"); 
+      rb_raise(rb_eNetcdfError, "Length of 'start' is too short\n");
   }
   c_start=ALLOCA_N(size_t,ndims);
   for(i=0; i<ndims; i++){
     l_start=NUM2INT(RARRAY_PTR(start)[ndims-1-i]);
-    
+
     if(l_start < 0) {
 	status = nc_inq_dimlen(ncid, dimids[i], &dimlen);
 	if(status != NC_NOERR) NC_RAISE(status);
@@ -4465,7 +4455,7 @@ NetCDF_put_vars_double(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride
     }
     c_start[i]=l_start;
   }
-  
+
   c_stride=ALLOCA_N(ptrdiff_t,ndims);
   switch(TYPE(stride)){
   case T_NIL:
@@ -4476,12 +4466,12 @@ NetCDF_put_vars_double(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride
   default:
       Check_Type(stride,T_ARRAY);
       if(RARRAY_LEN(stride) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'stride' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  c_stride[i]=NUM2INT(RARRAY_PTR(stride)[ndims-1-i]);
 	  if(c_stride[i]==0) {
-	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n"); 
+	      rb_raise(rb_eNetcdfError, "stride cannot be zero\n");
 	  }
       }
   }
@@ -4499,7 +4489,7 @@ NetCDF_put_vars_double(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride
   default:
       Check_Type(end,T_ARRAY);
       if(RARRAY_LEN(end) < ndims) {
-	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n"); 
+	  rb_raise(rb_eNetcdfError, "Length of 'end' is too short\n");
       }
       for(i=0; i<ndims; i++){
 	  l_end=NUM2INT(RARRAY_PTR(end)[ndims-1-i]);
@@ -4516,8 +4506,8 @@ NetCDF_put_vars_double(VALUE Var,VALUE NArray,VALUE start,VALUE end,VALUE stride
 	  ptr = ALLOCA_N(double,c_count_all);
 	  for(i=0;i<c_count_all;i++){ptr[i]=scalar;}
       } else if(len != c_count_all) {
-	  rb_raise(rb_eNetcdfError, 
-              "lengh of the array does not agree with that of the subset\n"); 
+	  rb_raise(rb_eNetcdfError,
+              "lengh of the array does not agree with that of the subset\n");
       }
   }
 
@@ -4565,7 +4555,7 @@ Init_netcdfraw(void)
   rb_eNetcdfEdge = rb_define_class("NetcdfEdge",rb_eNetcdfError);
   rb_eNetcdfStride = rb_define_class("NetcdfStride",rb_eNetcdfError);
   rb_eNetcdfBadname = rb_define_class("NetcdfBadname",rb_eNetcdfError);
-  /* N.B. following must match value in ncx.h */ 
+  /* N.B. following must match value in ncx.h */
   rb_eNetcdfRange = rb_define_class("NetcdfRange",rb_eNetcdfError);
   rb_eNetcdfNomem = rb_define_class("NetcdfNomem",rb_eNetcdfError);
   /* Global error status */
@@ -4583,16 +4573,21 @@ Init_netcdfraw(void)
   rb_define_const(cNetCDF, "NC_NOCLOBBER", INT2FIX(NC_NOCLOBBER));
 #if NCVER >= 400
   rb_define_const(cNetCDF, "NC_64BIT_OFFSET", INT2FIX(NC_64BIT_OFFSET));
-     /* NC_64BIT_OFFSET supports large files in the class data format */ 
+     /* NC_64BIT_OFFSET supports large files in the class data format */
   rb_define_const(cNetCDF, "NC_NETCDF4", INT2FIX(NC_NETCDF4));
   rb_define_const(cNetCDF, "NC_CLASSIC_MODEL", INT2FIX(NC_CLASSIC_MODEL));
-     /* for use as ( NC_NETCDF4 | NC_CLASSIC_MODEL ) to ensure the classic 
+     /* for use as ( NC_NETCDF4 | NC_CLASSIC_MODEL ) to ensure the classic
         data model in NetCDF4 by disabling new features like groups */
   rb_define_const(cNetCDF, "NC_ENDIAN_NATIVE", INT2FIX(NC_ENDIAN_NATIVE));
   rb_define_const(cNetCDF, "NC_ENDIAN_LITTLE", INT2FIX(NC_ENDIAN_LITTLE));
   rb_define_const(cNetCDF, "NC_ENDIAN_BIG", INT2FIX(NC_ENDIAN_BIG));
+
+  rb_define_const(cNetCDF, "NC_FORMAT_CLASSIC", INT2FIX(NC_FORMAT_CLASSIC));
+  rb_define_const(cNetCDF, "NC_FORMAT_64BIT", INT2FIX(NC_FORMAT_64BIT));
+  rb_define_const(cNetCDF, "NC_FORMAT_NETCDF4", INT2FIX(NC_FORMAT_NETCDF4));
+  rb_define_const(cNetCDF, "NC_FORMAT_NETCDF4_CLASSIC", INT2FIX(NC_FORMAT_NETCDF4_CLASSIC));
 #endif
- 
+
 #ifdef NARRAY_BIGMEM
   rb_define_const(cNetCDF, "SUPPORT_BIGMEM", Qtrue);
 #else
@@ -4617,6 +4612,9 @@ Init_netcdfraw(void)
   rb_define_method(cNetCDF,"ndims",NetCDF_ndims,0);
   rb_define_method(cNetCDF,"nvars",NetCDF_nvars,0);
   rb_define_method(cNetCDF,"natts",NetCDF_natts,0);
+#if NCVER >= 400
+  rb_define_method(cNetCDF,"format",NetCDF_format,0);
+#endif
   rb_define_method(cNetCDF,"sync",NetCDF_sync,0);
   rb_define_method(cNetCDF,"path",NetCDF_path,0);
   rb_define_method(cNetCDF,"dim",NetCDF_dim,1);
@@ -4626,7 +4624,7 @@ Init_netcdfraw(void)
   rb_define_private_method(cNetCDF,"id2var",NetCDF_id2var,1);
   rb_define_private_method(cNetCDF,"id2dim",NetCDF_id2dim,1);
   rb_define_private_method(cNetCDF,"id2att",NetCDF_id2att,1);
-  rb_define_method(cNetCDF,"==",NetCDF_eql,1); 
+  rb_define_method(cNetCDF,"==",NetCDF_eql,1);
   /* rb_define_method(cNetCDF,"eql?",NetCDF_eql,1); */
 
   /* The methods of the NetCDFDim class */
@@ -4704,7 +4702,7 @@ Init_netcdfraw(void)
   rb_define_method(cNetCDFVar,"get_var_int",NetCDF_get_var_int,0);
   rb_define_method(cNetCDFVar,"get_var_sfloat",NetCDF_get_var_float,0);
   rb_define_method(cNetCDFVar,"get_var_float",NetCDF_get_var_double,0);
-  
+
   rb_define_method(cNetCDFVar,"get_vars_char",NetCDF_get_vars_char,3);
   rb_define_method(cNetCDFVar,"get_vars_byte",NetCDF_get_vars_byte,3);
   rb_define_method(cNetCDFVar,"get_vars_sint",NetCDF_get_vars_sint,3);