[SCM] ruby-hdfeos5 branch, master, updated. upstream/1.0-11-gf742e1f
Youhei SASAKI
uwabami at gfd-dennou.org
Sun May 1 22:19:20 UTC 2011
The following commit has been merged in the master branch:
commit 41adbc45896a64c46c28e0cf4e433a5b4a63f1e7
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Mon Apr 25 12:32:35 2011 +0900
Imported Upstream version 1.1
diff --git a/ChangeLog b/ChangeLog
index 4bf9862..ea69516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-This file is generated automatically by
+-e This file is generated automatically by
cvs2cl -r -b -t --fsf -w --header <This header>
@@ -6,18 +6,76 @@ This file is generated automatically by
This script is available from http://www.red-bean.com/cvs2cl/
+2011-02-25 Friday 17:07 horinout
+
+ * ChangeLog (1.11):
+ * Ruby-HDFEOS5 ver 1.1 released (cvs tag ruby-hdfeos5-1_1)
+
+2011-02-18 Friday 17:32 horinout
+
+ * test/test_pt.rb (1.3):
+ * Added comments to the lines that cause error messaging, which is
+ not due to actual errors.
+
+2010-12-28 Tuesday 10:44 koshiro
+
+ * ChangeLog (1.10):
+ * update ChangeLog
+
+2010-12-28 Tuesday 10:36 koshiro
+
+ * hdfeos5_chkdatatype.c (1.5), hdfeos5_obj2cary.c (1.5),
+ hdfeos5gd_wrap.c (1.6), hdfeos5main_wrap.c (1.4),
+ hdfeos5pt_wrap.c (1.4), hdfeos5sw_wrap.c (1.13), hdfeos5za_wrap.c
+ (1.7):
+ * Ruby 1.9.2 compatibility
+
+2010-04-05 Monday 15:58 koshiro
+
+ * ChangeLog (1.9):
+ * update ChangeLog
+
+2010-04-05 Monday 15:55 koshiro
+
+ * hdfeos5_chkdatatype.c (1.4), hdfeos5_obj2cary.c (1.4),
+ hdfeos5gd_wrap.c (1.5), hdfeos5main_wrap.c (1.3),
+ hdfeos5pt_wrap.c (1.3), hdfeos5sw_wrap.c (1.12), hdfeos5za_wrap.c
+ (1.6):
+
+ * Ruby 1.9 compatibility
+
+2010-04-05 Monday 15:28 koshiro
+
+ * extconf.rb (1.2):
+
+ * extconf.rb: bug fix.
+
+2009-07-03 Friday 19:42 horikawa
+
+ * lib/hdfeos5.rb (1.21, ruby-hdfeos5-1_0):
+ bugfix
+
+2009-04-24 Friday 16:20 horikawa
+
+ * ChangeLog (1.8, ruby-hdfeos5-1_0), hdfeos5za_wrap.c (1.5,
+ ruby-hdfeos5-1_0), lib/hdfeos5.rb (1.20), test/test_za.rb (1.3,
+ ruby-hdfeos5-1_0): changed info() to fieldinfo()
+
2009-04-22 Wednesday 13:54 horikawa
- * ChangeLog (1.7), hdfeos5pt_wrap.c (1.2), test/test_pt.rb (1.2):
- supported linkage point (point wrapper)
+ * ChangeLog (1.7), hdfeos5pt_wrap.c (1.2, ruby-hdfeos5-1_0),
+ test/test_pt.rb (1.2, ruby-hdfeos5-1_0): supported linkage point
+ (point wrapper)
2009-04-20 Monday 13:11 horikawa
- * ChangeLog (1.6), hdfeos5_chkdatatype.c (1.3), hdfeos5_obj2cary.c
- (1.3), hdfeos5gd_wrap.c (1.4), hdfeos5main_wrap.c (1.2),
- hdfeos5pt_wrap.c (1.1), hdfeos5sw_wrap.c (1.11), hdfeos5za_wrap.c
- (1.4), lib/hdfeos5.rb (1.19), test/test_gd.rb (1.2),
- test/test_pt.rb (1.1), test/test_sw.rb (1.2), test/test_za.rb
+ * ChangeLog (1.6), hdfeos5_chkdatatype.c (1.3, ruby-hdfeos5-1_0),
+ hdfeos5_obj2cary.c (1.3, ruby-hdfeos5-1_0), hdfeos5gd_wrap.c
+ (1.4, ruby-hdfeos5-1_0), hdfeos5main_wrap.c (1.2,
+ ruby-hdfeos5-1_0), hdfeos5pt_wrap.c (1.1), hdfeos5sw_wrap.c
+ (1.11, ruby-hdfeos5-1_0), hdfeos5za_wrap.c (1.4), lib/hdfeos5.rb
+ (1.19), test/test_gd.rb (1.2, ruby-hdfeos5-1_0), test/test_pt.rb
+ (1.1), test/test_sw.rb (1.2, ruby-hdfeos5-1_0), test/test_za.rb
(1.2): modified simple_put and put_with_miss modified the
readfield function ( swath / grid / zonal ) modified
HE5Wrap_store_NArray1D_or_str added point wrapper ( support only
@@ -53,10 +111,13 @@ This file is generated automatically by
2009-03-06 Friday 11:40 horikawa
- * test/: MLS-Aura_L2GP-O3_v02-21-c01_2007d059.he5 (1.1),
+ * test/: MLS-Aura_L2GP-O3_v02-21-c01_2007d059.he5 (1.1,
+ ruby-hdfeos5-1_0),
OMI-Aura_L2-OMAERO_2008m0229t0011-o19277_v003-2008m0229t061514.he5
- (1.1), OMI-Aura_L3-OMAEROe_2008m0101_v003-2009m0114t114202.he5
- (1.1), test_gd.rb (1.1), test_sw.rb (1.1), test_za.rb (1.1):
+ (1.1, ruby-hdfeos5-1_0),
+ OMI-Aura_L3-OMAEROe_2008m0101_v003-2009m0114t114202.he5 (1.1,
+ ruby-hdfeos5-1_0), test_gd.rb (1.1), test_sw.rb (1.1), test_za.rb
+ (1.1):
* Set up testfile(test_sw,test_gd,test_za) and
testdata(AIRS,MLS,OMI).
@@ -214,7 +275,7 @@ This file is generated automatically by
2008-06-09 Monday 15:03 horinout
- * Makefile (1.2), Makefile_CL (1.1):
+ * Makefile (1.2), Makefile_CL (1.1, ruby-hdfeos5-1_0):
* Renamed Makefile to create ChangeLog to Makefile_CL
2008-06-09 Monday 14:52 horinout
@@ -232,7 +293,7 @@ This file is generated automatically by
2008-06-09 Monday 13:45 horinout
- * lib/: hdfeos5.rb (1.1), numru/hdfeos5.rb (1.2):
+ * lib/hdfeos5.rb (1.1):
* Moved lib/numru/hdfeos5.rb to lib/hdfeos5.rb
(lib/numru/hdfeos5.rb would be installed in
sitelibdir/numru/numru/)
@@ -242,13 +303,12 @@ This file is generated automatically by
2008-06-05 Thursday 18:17 horikawa
* SWapi.c (1.1), extconf.rb (1.1), hdfeos5_cary2obj.c (1.1),
- hdfeos5_obj2cary.c (1.1), lib/numru/hdfeos5.rb (1.1): Initial
- revision
+ hdfeos5_obj2cary.c (1.1): Initial revision
2008-06-05 Thursday 18:17 horikawa
- * SWapi.c (1.1.1.1), extconf.rb (1.1.1.1), hdfeos5_cary2obj.c
- (1.1.1.1), hdfeos5_obj2cary.c (1.1.1.1), lib/numru/hdfeos5.rb
- (1.1.1.1) (utags: Initial): initial import of ruby-hdfeos5 into
- CVS
+ * SWapi.c (1.1.1.1), extconf.rb (1.1.1.1, ruby-hdfeos5-1_0),
+ hdfeos5_cary2obj.c (1.1.1.1, ruby-hdfeos5-1_0),
+ hdfeos5_obj2cary.c (1.1.1.1) (utags: Initial): initial import of
+ ruby-hdfeos5 into CVS
diff --git a/extconf.rb b/extconf.rb
index 2163cde..7cceae4 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -14,9 +14,27 @@ EOS
exit(-1)
end
+dir_config('hdf5',$sitearchdir,$sitearchdir)
+
+if ( ! ( have_header("hdf5.h") && have_library("hdf5") ) )then
+ print <<-EOS
+ ** configure error **
+ Header hdf.h or the compiled hdf5 library is not found.
+ If you have the library installed under /hdf5dir (that is, hdf5.h is
+ in /hdf5dir/include and the library in /hdf5dir/lib/),
+ try the following:
+
+ % ruby extconf.rb --with-hdf5-dir=/hdf5dir
+
+ Alternatively, you can specify the two directory separately
+ with --with-hdf5-include and --with-hdf5-lib.
+ EOS
+ exit(-1)
+end
+
dir_config('hdfeos5',$sitearchdir,$sitearchdir)
-if ( ! ( have_header("hdf5.h") && have_header("HE5_HdfEosDef.h") && have_library("he5_hdfeos") && have_library("hdf5") ) )then
+if ( ! ( have_header("HE5_HdfEosDef.h") && have_library("Gctp") && have_library("he5_hdfeos") ) )then
print <<-EOS
** configure error **
Header hdfeos5.h or the compiled hdfeos5 library is not found.
diff --git a/hdfeos5_chkdatatype.c b/hdfeos5_chkdatatype.c
index 3fe2fac..e01a12b 100644
--- a/hdfeos5_chkdatatype.c
+++ b/hdfeos5_chkdatatype.c
@@ -5,8 +5,12 @@
#include "narray.h"
#include<string.h>
+/* for compatibility with ruby 1.6 */
#ifndef RSTRING_PTR
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
static VALUE rb_eHE5Error;
@@ -78,7 +82,7 @@ HE5Wrap_store_NArray1D_or_str(int ntype, VALUE obj, void **ptr){
case HE5T_CHARSTRING:
switch (TYPE(obj)){
case T_STRING:
- Check_SafeStr(obj);
+ SafeStringValue(obj);
*ptr = (char *) RSTRING_PTR(obj);
break;
case T_ARRAY:
diff --git a/hdfeos5_obj2cary.c b/hdfeos5_obj2cary.c
index 51bced1..513fcc6 100644
--- a/hdfeos5_obj2cary.c
+++ b/hdfeos5_obj2cary.c
@@ -2,6 +2,20 @@
#include "ruby.h"
#include "narray.h"
+/* for compatibility with ruby 1.6 */
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(a) (RARRAY(a)->ptr)
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) (RARRAY(a)->len)
+#endif
+#ifndef RFLOAT_VALUE
+#define RFLOAT_VALUE(v) (RFLOAT(v)->value)
+#endif
+#ifndef StringValueCStr
+#define StringValueCStr(s) STR2CSTR(s)
+#endif
+
VALUE mHE5=0;
/* functions */
@@ -35,7 +49,7 @@ static unsigned long long *na2cunsint64ary(VALUE);
/* defines */
#define BE_INTEGER(x) ((int)(NUM2INT(rb_Integer(x))))
#define BE_LONG(x) ((long)(NUM2INT(rb_Integer(x))))
-#define BE_FLOAT(x) ((RFLOAT(rb_Float(x))->value))
+#define BE_FLOAT(x) (RFLOAT_VALUE(rb_Float(x)))
/*
* hdfeos5_obj2cxxxary() : convert ruby object to c xxx type array
@@ -163,13 +177,15 @@ hdfeos5_obj2cfloatary(VALUE src)
VALUE chk;
float *rtn;
char *klass;
+ VALUE klass_tmp;
VALUE rmiss;
switch (TYPE(src)){
case T_OBJECT:
- klass = STR2CSTR( rb_funcall(rb_funcall(src, rb_intern("class"),0),
- rb_intern("to_s"),0) );
+ klass_tmp = rb_funcall(rb_funcall(src, rb_intern("class"),0),
+ rb_intern("to_s"),0);
+ klass = StringValueCStr(klass_tmp);
if (strncmp(klass,"NArrayMiss",10) != 0) {
rb_raise(rb_eTypeError, "a numeric array expected");
}
@@ -271,8 +287,8 @@ ary2ccharary(VALUE src,int size,int charlen)
Check_Type(src, T_ARRAY);
- len = RARRAY(src)->len;
- ptr = RARRAY(src)->ptr;
+ len = RARRAY_LEN(src);
+ ptr = RARRAY_PTR(src);
rtn = ALLOC_N(char, size);
memset(rtn, '\0', size);
@@ -293,8 +309,8 @@ ary2cintary(VALUE src)
Check_Type(src, T_ARRAY);
- len = RARRAY(src)->len;
- ptr = RARRAY(src)->ptr;
+ len = RARRAY_LEN(src);
+ ptr = RARRAY_PTR(src);
rtn = ALLOC_N(int, len);
@@ -314,8 +330,8 @@ ary2clongary(VALUE src)
Check_Type(src, T_ARRAY);
- len = RARRAY(src)->len;
- ptr = RARRAY(src)->ptr;
+ len = RARRAY_LEN(src);
+ ptr = RARRAY_PTR(src);
rtn = ALLOC_N(long, len);
@@ -335,8 +351,8 @@ ary2csint64ary(VALUE src)
Check_Type(src, T_ARRAY);
- len = RARRAY(src)->len;
- ptr = RARRAY(src)->ptr;
+ len = RARRAY_LEN(src);
+ ptr = RARRAY_PTR(src);
rtn = ALLOC_N(signed long long, len);
@@ -356,8 +372,8 @@ ary2cunsint64ary(VALUE src)
Check_Type(src, T_ARRAY);
- len = RARRAY(src)->len;
- ptr = RARRAY(src)->ptr;
+ len = RARRAY_LEN(src);
+ ptr = RARRAY_PTR(src);
rtn = ALLOC_N(unsigned long long, len);
@@ -377,8 +393,8 @@ ary2cfloatary(VALUE src)
Check_Type(src, T_ARRAY);
- len = RARRAY(src)->len;
- ptr = RARRAY(src)->ptr;
+ len = RARRAY_LEN(src);
+ ptr = RARRAY_PTR(src);
rtn = ALLOC_N(float , len);
diff --git a/hdfeos5gd_wrap.c b/hdfeos5gd_wrap.c
index e440f9f..069c3ba 100644
--- a/hdfeos5gd_wrap.c
+++ b/hdfeos5gd_wrap.c
@@ -5,8 +5,18 @@
#include "narray.h"
#include<string.h>
+/* for compatibility with ruby 1.6 */
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(a) (RARRAY(a)->ptr)
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) (RARRAY(a)->len)
+#endif
#ifndef RSTRING_PTR
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
extern int check_numbertype(char *);
@@ -277,7 +287,7 @@ gdnentries_count(hid_t i_gridid, VALUE entrycode)
long o_count;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
c_entrycode = RSTRING_PTR(entrycode);
o_count = HE5_GDnentries(i_gridid, change_entrycode(c_entrycode), &o_strbufsize);
@@ -293,7 +303,7 @@ gdnentries_strbuf(hid_t i_gridid, VALUE entrycode)
long o_count;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
c_entrycode = RSTRING_PTR(entrycode);
o_count = HE5_GDnentries(i_gridid, change_entrycode(c_entrycode), &o_strbufsize);
@@ -322,7 +332,7 @@ hdfeos5_gdcreate(VALUE mod, VALUE gridname, VALUE xdimsize, VALUE ydimsize, VALU
file=he5file->name;
Check_Type(gridname,T_STRING);
- Check_SafeStr(gridname);
+ SafeStringValue(gridname);
i_gridname = RSTRING_PTR(gridname);
Check_Type(xdimsize,T_FIXNUM);
i_xdimsize = NUM2INT(xdimsize);
@@ -362,7 +372,7 @@ hdfeos5_gdattach(VALUE mod, VALUE gridname)
i_fname=he5file->name;
Check_Type(gridname,T_STRING);
- Check_SafeStr(gridname);
+ SafeStringValue(gridname);
i_gridname = RSTRING_PTR(gridname);
gdid = HE5_GDattach(i_fid, i_gridname);
@@ -387,7 +397,7 @@ hdfeos5_gddefdim(VALUE mod, VALUE dimname, VALUE dim)
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
Check_Type(dimname,T_STRING);
- Check_SafeStr(dimname);
+ SafeStringValue(dimname);
Check_Type(dim,T_FIXNUM);
i_dimname = RSTRING_PTR(dimname);
i_dim = NUM2LONG(dim);
@@ -412,7 +422,7 @@ hdfeos5_gddefproj(VALUE mod, VALUE projcode, VALUE zonecode, VALUE spherecode, V
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
Check_Type(projcode,T_STRING);
- Check_SafeStr(projcode);
+ SafeStringValue(projcode);
Check_Type(zonecode,T_FIXNUM);
Check_Type(spherecode,T_FIXNUM);
if (TYPE(projparm) == T_FLOAT) {
@@ -442,7 +452,7 @@ hdfeos5_gdblksomoffset(VALUE mod, VALUE offset, VALUE count, VALUE code)
Data_Get_Struct(mod, struct HE5Gd, he5grid);
i_gridid=he5grid->gdid;
Check_Type(code,T_STRING);
- Check_SafeStr(code);
+ SafeStringValue(code);
Check_Type(offset,T_FIXNUM);
Check_Type(count,T_FIXNUM);
i_code = RSTRING_PTR(code);
@@ -475,7 +485,7 @@ hdfeos5_gddefcomp(VALUE mod, VALUE compcode, VALUE compparm)
i_gridid=he5grid->gdid;
Check_Type(compcode,T_STRING);
- Check_SafeStr(compcode);
+ SafeStringValue(compcode);
if ((TYPE(compparm) == T_BIGNUM) || (TYPE(compparm) == T_FIXNUM)) {
compparm = rb_Array(compparm);
}
@@ -504,7 +514,7 @@ hdfeos5_gddeftile(VALUE mod, VALUE tilecode, VALUE tilerank, VALUE tiledims)
i_gridid=he5grid->gdid;
Check_Type(tilecode,T_STRING);
- Check_SafeStr(tilecode);
+ SafeStringValue(tilecode);
i_tilecode = change_tilingcode(RSTRING_PTR(tilecode));
Check_Type(tilerank,T_FIXNUM);
@@ -537,7 +547,7 @@ hdfeos5_gddefcomtile(VALUE mod, VALUE compcode, VALUE compparm, VALUE tilerank,
i_gridid=he5grid->gdid;
Check_Type(compcode,T_STRING);
- Check_SafeStr(compcode);
+ SafeStringValue(compcode);
if ((TYPE(compparm) == T_BIGNUM) || (TYPE(compparm) == T_FIXNUM)) {
compparm = rb_Array(compparm);
}
@@ -572,7 +582,7 @@ hdfeos5_gddeforigin(VALUE mod, VALUE origincode)
i_gridid=he5grid->gdid;
Check_Type(origincode,T_STRING);
- Check_SafeStr(origincode);
+ SafeStringValue(origincode);
i_origincode = change_gridorigincode(RSTRING_PTR(origincode));
o_rtn_val = HE5_GDdeforigin(i_gridid, i_origincode);
@@ -594,7 +604,7 @@ hdfeos5_gddefpixreg(VALUE mod, VALUE pixregcode)
i_gridid=he5grid->gdid;
Check_Type(pixregcode,T_STRING);
- Check_SafeStr(pixregcode);
+ SafeStringValue(pixregcode);
i_pixregcode = change_pixelregistcode(RSTRING_PTR(pixregcode));
o_rtn_val = HE5_GDdefpixreg(i_gridid, i_pixregcode);
@@ -616,7 +626,7 @@ hdfeos5_gddiminfo(VALUE mod, VALUE dimname)
i_gridid=he5grid->gdid;
Check_Type(dimname,T_STRING);
- Check_SafeStr(dimname);
+ SafeStringValue(dimname);
i_dimname = RSTRING_PTR(dimname);
o_ndim = HE5_GDdiminfo(i_gridid, i_dimname);
@@ -838,13 +848,13 @@ hdfeos5_gddeffield(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdimlist,
i_gridid=he5grid->gdid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(maxdimlist,T_STRING);
- Check_SafeStr(maxdimlist);
+ SafeStringValue(maxdimlist);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
Check_Type(merge,T_FIXNUM);
i_fieldname = RSTRING_PTR(fieldname);
@@ -878,9 +888,9 @@ hdfeos5_gdwritefieldmeta(VALUE mod, VALUE dimlist, VALUE numbertype)
i_gridid=he5field->gdid;
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
i_dimlist = RSTRING_PTR(dimlist);
i_numbertype = change_numbertype(RSTRING_PTR(numbertype));
@@ -895,7 +905,7 @@ hdfeos5_gdwritefield(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE dat
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -946,7 +956,7 @@ hdfeos5_gdreadfield(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE ntyp
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -1010,9 +1020,9 @@ hdfeos5_gdwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_gridid=he5grid->gdid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1044,7 +1054,7 @@ hdfeos5_gd_get_att(VALUE mod, VALUE attrname)
i_gridid=he5grid->gdid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_GDattrinfo(i_gridid, i_attrname, &o_ntype, &o_count);
@@ -1100,9 +1110,9 @@ hdfeos5_gdsetfillvalue(VALUE mod, VALUE fieldname, VALUE numbertype, VALUE fillv
i_gridid=he5grid->gdid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
i_fieldname = RSTRING_PTR(fieldname);
i_numbertype = change_numbertype(RSTRING_PTR(numbertype));
@@ -1112,7 +1122,7 @@ hdfeos5_gdsetfillvalue(VALUE mod, VALUE fieldname, VALUE numbertype, VALUE fillv
}
if (TYPE(fillval) == T_STRING) {
Check_Type(fillval,T_STRING);
- Check_SafeStr(fillval);
+ SafeStringValue(fillval);
i_fillval = RSTRING_PTR(fillval);
}
@@ -1138,7 +1148,7 @@ hdfeos5_gdgetfillvalue(VALUE mod,VALUE fieldname)
i_gridid=he5grid->gdid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
o_fillval = (void*)malloc(HE5_BLKSIZE);
@@ -1171,11 +1181,11 @@ hdfeos5_gdinqdatatype(VALUE mod, VALUE fieldname, VALUE attrname, VALUE group)
i_gridid=he5grid->gdid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(group,T_STRING);
- Check_SafeStr(group);
+ SafeStringValue(group);
i_fieldname = RSTRING_PTR(fieldname);
i_attrname = RSTRING_PTR(attrname);
@@ -1207,7 +1217,7 @@ hdfeos5_gdnentries(VALUE mod, VALUE entrycode)
i_gridid=he5grid->gdid;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
i_entrycode = change_entrycode(RSTRING_PTR(entrycode));
o_count = HE5_GDnentries(i_gridid, i_entrycode, &o_strbufsize);
@@ -1367,7 +1377,7 @@ hdfeos5_gdrs2ll(VALUE mod, VALUE projcode, VALUE projparm, VALUE xdimsize, VALUE
i_gridid=he5grid->gdid;
Check_Type(projcode,T_STRING);
- Check_SafeStr(projcode);
+ SafeStringValue(projcode);
i_projcode = change_projcode(RSTRING_PTR(projcode));
Check_Type(xdimsize,T_FIXNUM);
i_xdimsize = NUM2INT(xdimsize);
@@ -1548,7 +1558,7 @@ hdfeos5_gddefvrtregion(VALUE mod, VALUE regionid, VALUE vertobj, VALUE range)
Check_Type(regionid,T_FIXNUM);
Check_Type(vertobj,T_STRING);
- Check_SafeStr(vertobj);
+ SafeStringValue(vertobj);
if (TYPE(range) == T_FLOAT) {
range = rb_Array(range);
}
@@ -1727,9 +1737,9 @@ hdfeos5_gdwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_gridid=he5field->gdid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1762,7 +1772,7 @@ hdfeos5_gdfield_get_att(VALUE mod,VALUE attrname)
i_fieldname=he5field->name;
i_gridid=he5field->gdid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_GDlocattrinfo(i_gridid, i_fieldname, i_attrname,
@@ -1825,9 +1835,9 @@ hdfeos5_gdwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_gridid=he5grid->gdid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1860,7 +1870,7 @@ hdfeos5_gd_get_grpatt(VALUE mod, VALUE attrname)
i_gridid=he5grid->gdid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_GDgrpattrinfo(i_gridid, i_attrname, &o_ntype, &o_count);
@@ -1887,7 +1897,7 @@ hdfeos5_gdsetextdata(VALUE mod, VALUE filelist, VALUE offset, VALUE size)
i_gridid=he5grid->gdid;
Check_Type(filelist,T_STRING);
- Check_SafeStr(filelist);
+ SafeStringValue(filelist);
if ((TYPE(offset) == T_BIGNUM) || (TYPE(offset) == T_FIXNUM)) {
offset = rb_Array(offset);
}
@@ -1927,7 +1937,7 @@ hdfeos5_gdgetextdata(VALUE mod, VALUE fieldname)
i_gridid=he5grid->gdid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
@@ -1957,7 +1967,7 @@ hdfeos5_gdsetalias(VALUE mod, VALUE fieldname)
i_gridid=he5grid->gdid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
o_rtn_val = HE5_GDsetalias(i_gridid, i_fieldname, o_aliaslist);
@@ -1981,9 +1991,9 @@ hdfeos5_gddropalias(VALUE mod, VALUE fldgroup, VALUE aliasname)
i_gridid=he5grid->gdid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(aliasname,T_STRING);
- Check_SafeStr(aliasname);
+ SafeStringValue(aliasname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_aliasname = RSTRING_PTR(aliasname);
@@ -2012,9 +2022,9 @@ hdfeos5_gdaliasinfo(VALUE mod, VALUE fldgroup, VALUE aliasname)
i_gridid=he5grid->gdid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(aliasname,T_STRING);
- Check_SafeStr(aliasname);
+ SafeStringValue(aliasname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_aliasname = RSTRING_PTR(aliasname);
@@ -2071,7 +2081,7 @@ hdfeos5_gdgetaliaslist(VALUE mod, VALUE fldgroup)
i_gridid=he5grid->gdid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
o_nalias = HE5_GDgetaliaslist(i_gridid, i_fldgroup, o_aliaslist, &o_strbufsize);
@@ -2135,7 +2145,7 @@ hdfeos5_gdsetfield(VALUE mod,VALUE fieldname)
i_gridid=he5grid->gdid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
he5field = HE5GdField_init(i_fieldname, i_gridid, mod);
@@ -2267,12 +2277,12 @@ hdfeos5_gdwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2287,11 +2297,11 @@ hdfeos5_gdwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2309,11 +2319,11 @@ hdfeos5_gdwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -2363,12 +2373,12 @@ hdfeos5_gdwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2383,11 +2393,11 @@ hdfeos5_gdwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2405,11 +2415,11 @@ hdfeos5_gdwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -2459,12 +2469,12 @@ hdfeos5_gdwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2479,11 +2489,11 @@ hdfeos5_gdwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2501,11 +2511,11 @@ hdfeos5_gdwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -2555,12 +2565,12 @@ hdfeos5_gdwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2575,11 +2585,11 @@ hdfeos5_gdwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2597,11 +2607,11 @@ hdfeos5_gdwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -2651,12 +2661,12 @@ hdfeos5_gdwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2671,11 +2681,11 @@ hdfeos5_gdwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2693,11 +2703,11 @@ hdfeos5_gdwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -2747,12 +2757,12 @@ hdfeos5_gdwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2767,11 +2777,11 @@ hdfeos5_gdwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2789,11 +2799,11 @@ hdfeos5_gdwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -2841,13 +2851,13 @@ hdfeos5_gdreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2872,12 +2882,12 @@ hdfeos5_gdreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2902,11 +2912,11 @@ hdfeos5_gdreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -2955,13 +2965,13 @@ hdfeos5_gdreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2986,12 +2996,12 @@ hdfeos5_gdreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3016,11 +3026,11 @@ hdfeos5_gdreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3069,13 +3079,13 @@ hdfeos5_gdreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3100,12 +3110,12 @@ hdfeos5_gdreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3130,11 +3140,11 @@ hdfeos5_gdreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3183,13 +3193,13 @@ hdfeos5_gdreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3214,12 +3224,12 @@ hdfeos5_gdreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3244,11 +3254,11 @@ hdfeos5_gdreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3297,13 +3307,13 @@ hdfeos5_gdreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3328,12 +3338,12 @@ hdfeos5_gdreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3358,11 +3368,11 @@ hdfeos5_gdreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3411,13 +3421,13 @@ hdfeos5_gdreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_GDfieldinfo(i_gridid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3442,12 +3452,12 @@ hdfeos5_gdreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3472,11 +3482,11 @@ hdfeos5_gdreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
diff --git a/hdfeos5main_wrap.c b/hdfeos5main_wrap.c
index 9cd352d..e943aef 100644
--- a/hdfeos5main_wrap.c
+++ b/hdfeos5main_wrap.c
@@ -6,7 +6,10 @@
#include<string.h>
#ifndef RSTRING_PTR
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
VALUE rb_eHE5Error;
@@ -72,9 +75,9 @@ hdfeos5_ehopen(VALUE mod, VALUE filename, VALUE flags)
struct HE5 *he5file;
Check_Type(filename,T_STRING);
- Check_SafeStr(filename);
+ SafeStringValue(filename);
Check_Type(flags,T_STRING);
- Check_SafeStr(flags);
+ SafeStringValue(flags);
i_filename = RSTRING_PTR(filename);
i_flags = RSTRING_PTR(flags);
diff --git a/hdfeos5pt_wrap.c b/hdfeos5pt_wrap.c
index 603fc74..d052663 100644
--- a/hdfeos5pt_wrap.c
+++ b/hdfeos5pt_wrap.c
@@ -5,8 +5,12 @@
#include "narray.h"
#include<string.h>
+/* for compatibility with ruby 1.6 */
#ifndef RSTRING_PTR
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
extern int check_numbertype(char *);
@@ -541,7 +545,7 @@ hdfeos5_ptcreate(VALUE mod, VALUE pointname)
file=he5file->name;
Check_Type(pointname,T_STRING);
- Check_SafeStr(pointname);
+ SafeStringValue(pointname);
i_pointname = RSTRING_PTR(pointname);
ptid = HE5_PTcreate(i_fid, i_pointname);
@@ -567,7 +571,7 @@ hdfeos5_ptattach(VALUE mod, VALUE pointname)
i_fname=he5file->name;
Check_Type(pointname,T_STRING);
- Check_SafeStr(pointname);
+ SafeStringValue(pointname);
i_pointname = RSTRING_PTR(pointname);
ptid = HE5_PTattach(i_fid, i_pointname);
@@ -753,7 +757,7 @@ hdfeos5_ptdeflevel(VALUE file, VALUE levelname, VALUE nfields, VALUE rank, VALUE
i_nfields=NUM2INT(nfields);
Check_Type(levelname,T_STRING);
- Check_SafeStr(levelname);
+ SafeStringValue(levelname);
i_levelname = RSTRING_PTR(levelname);
i_rank=ALLOCA_N(int,i_nfields*sizeof(int));
@@ -761,14 +765,14 @@ hdfeos5_ptdeflevel(VALUE file, VALUE levelname, VALUE nfields, VALUE rank, VALUE
i_rank = hdfeos5_obj2cintary(rank);
Check_Type(fieldlist,T_STRING);
- Check_SafeStr(fieldlist);
+ SafeStringValue(fieldlist);
i_fieldlist = RSTRING_PTR(fieldlist);
dimlist = rb_Array(dimlist);
i_dimlist = hdfeos5_obj2clongary(dimlist);
Check_Type(datatype,T_STRING);
- Check_SafeStr(datatype);
+ SafeStringValue(datatype);
i_datatype = RSTRING_PTR(datatype);
nn = HE5_EHparsestr(i_datatype, ',', pntr, slen);
i_array = ALLOCA_N(int, i_nfields);
@@ -806,13 +810,13 @@ hdfeos5_ptdeflinkage(VALUE file, VALUE parent_level, VALUE child_level,VALUE lin
i_ptid=he5point->ptid;
Check_Type(parent_level,T_STRING);
- Check_SafeStr(parent_level);
+ SafeStringValue(parent_level);
i_parent_level = RSTRING_PTR(parent_level);
Check_Type(child_level,T_STRING);
- Check_SafeStr(child_level);
+ SafeStringValue(child_level);
i_child_level = RSTRING_PTR(child_level);
Check_Type(linklevel,T_STRING);
- Check_SafeStr(linklevel);
+ SafeStringValue(linklevel);
i_linklevel = RSTRING_PTR(linklevel);
o_rtn_val = HE5_PTdeflinkage(i_ptid, i_parent_level, i_child_level, i_linklevel);
@@ -825,7 +829,7 @@ hdfeos5_ptwritelevel(VALUE mod, VALUE count, VALUE data, VALUE ntype)
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -889,9 +893,9 @@ hdfeos5_ptwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_ptid=he5point->ptid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -923,7 +927,7 @@ hdfeos5_pt_get_att(VALUE mod, VALUE attrname)
i_ptid=he5point->ptid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_PTattrinfo(i_ptid, i_attrname, &o_ntype, &o_count);
@@ -996,7 +1000,7 @@ hdfeos5_ptreadlevel(VALUE mod, VALUE ntype)
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -1064,9 +1068,9 @@ hdfeos5_ptinqdatatype(VALUE mod, VALUE levelname, VALUE attrname, VALUE group)
i_ptid=he5point->ptid;
Check_Type(levelname,T_STRING);
- Check_SafeStr(levelname);
+ SafeStringValue(levelname);
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_levelname = RSTRING_PTR(levelname);
i_attrname = RSTRING_PTR(attrname);
@@ -1158,9 +1162,9 @@ hdfeos5_ptwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_ptid=he5point->ptid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1192,7 +1196,7 @@ hdfeos5_pt_get_grpatt(VALUE mod, VALUE attrname)
i_ptid=he5point->ptid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_PTgrpattrinfo(i_ptid, i_attrname, &o_ntype, &o_count);
@@ -1251,9 +1255,9 @@ hdfeos5_ptwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_ptid=he5point->ptid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1286,7 +1290,7 @@ hdfeos5_ptfield_get_att(VALUE mod,VALUE attrname)
i_levelname=he5point->levelname;
i_ptid=he5point->ptid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_PTlocattrinfo(i_ptid, i_levelname, i_attrname,
@@ -1406,7 +1410,7 @@ hdfeos5_ptupdatelevel(VALUE mod, VALUE nrec, VALUE recs, VALUE data, VALUE ntype
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -1510,7 +1514,7 @@ hdfeos5_ptchkfieldname(VALUE mod,VALUE levelname)
i_ptid=he5pt->ptid;
Check_Type(levelname,T_STRING);
- Check_SafeStr(levelname);
+ SafeStringValue(levelname);
i_levelname = RSTRING_PTR(levelname);
o_level=HE5_PTlevelindx(i_ptid, i_levelname);
@@ -1541,7 +1545,7 @@ hdfeos5_ptsetfield(VALUE mod,VALUE fieldname)
i_ptid=he5pt->ptid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
o_strbufsize = search_levelsize(i_ptid,i_fieldname);
@@ -1566,7 +1570,7 @@ hdfeos5_ptsetfield_level(VALUE mod,VALUE fieldname,VALUE levelname)
i_ptid=he5pt->ptid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
i_levelname = RSTRING_PTR(levelname);
diff --git a/hdfeos5sw_wrap.c b/hdfeos5sw_wrap.c
index e0fc6b1..55473d6 100644
--- a/hdfeos5sw_wrap.c
+++ b/hdfeos5sw_wrap.c
@@ -5,8 +5,18 @@
#include "narray.h"
#include<string.h>
+/* for compatibility with ruby 1.6 */
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(a) (RARRAY(a)->ptr)
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) (RARRAY(a)->len)
+#endif
#ifndef RSTRING_PTR
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
extern int check_numbertype(char *);
@@ -270,7 +280,7 @@ swnentries_count(hid_t i_swathid, VALUE entrycode)
long o_count;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
c_entrycode = RSTRING_PTR(entrycode);
o_count = HE5_SWnentries(i_swathid, change_entrycode(c_entrycode), &o_strbufsize);
@@ -286,7 +296,7 @@ swnentries_strbuf(hid_t i_swathid, VALUE entrycode)
long o_count;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
c_entrycode = RSTRING_PTR(entrycode);
o_count = HE5_SWnentries(i_swathid, change_entrycode(c_entrycode), &o_strbufsize);
@@ -311,7 +321,7 @@ hdfeos5_swcreate(VALUE mod, VALUE swathname)
file=he5file->name;
Check_Type(swathname,T_STRING);
- Check_SafeStr(swathname);
+ SafeStringValue(swathname);
i_swathname = RSTRING_PTR(swathname);
swid = HE5_SWcreate(i_fid, i_swathname);
@@ -337,7 +347,7 @@ hdfeos5_swattach(VALUE mod, VALUE swathname)
i_fname=he5file->name;
Check_Type(swathname,T_STRING);
- Check_SafeStr(swathname);
+ SafeStringValue(swathname);
i_swathname = RSTRING_PTR(swathname);
swid = HE5_SWattach(i_fid, i_swathname);
@@ -362,7 +372,7 @@ hdfeos5_swdefdim(VALUE mod, VALUE dimname, VALUE dim)
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
Check_Type(dimname,T_STRING);
- Check_SafeStr(dimname);
+ SafeStringValue(dimname);
Check_Type(dim,T_FIXNUM);
i_dimname = RSTRING_PTR(dimname);
i_dim = NUM2LONG(dim);
@@ -385,7 +395,7 @@ hdfeos5_swdiminfo(VALUE mod, VALUE dimname)
i_swathid=he5swath->swid;
Check_Type(dimname,T_STRING);
- Check_SafeStr(dimname);
+ SafeStringValue(dimname);
i_dimname = RSTRING_PTR(dimname);
o_ndim = HE5_SWdiminfo(i_swathid, i_dimname);
@@ -411,9 +421,9 @@ hdfeos5_swmapinfo(VALUE mod, VALUE geodim, VALUE datadim)
i_swathid=he5swath->swid;
Check_Type(geodim,T_STRING);
- Check_SafeStr(geodim);
+ SafeStringValue(geodim);
Check_Type(datadim,T_STRING);
- Check_SafeStr(datadim);
+ SafeStringValue(datadim);
i_geodim = RSTRING_PTR(geodim);
i_datadim = RSTRING_PTR(datadim);
@@ -446,9 +456,9 @@ hdfeos5_swidxmapinfo(VALUE mod, VALUE geodim, VALUE datadim)
i_swathid=he5swath->swid;
Check_Type(geodim,T_STRING);
- Check_SafeStr(geodim);
+ SafeStringValue(geodim);
Check_Type(datadim,T_STRING);
- Check_SafeStr(datadim);
+ SafeStringValue(datadim);
dimsize = hdfeos5_swdiminfo(mod, geodim);
size = NUM2INT(dimsize);
@@ -541,7 +551,7 @@ hdfeos5_swchunkinfo(VALUE mod, VALUE fldname)
Data_Get_Struct(mod, struct HE5Sw, he5swath);
i_swathid=he5swath->swid;
Check_Type(fldname,T_STRING);
- Check_SafeStr(fldname);
+ SafeStringValue(fldname);
i_fldname = RSTRING_PTR(fldname);
o_rtn_val = HE5_SWchunkinfo(i_swathid, i_fldname, &o_chunk_rank, NULL);
@@ -573,9 +583,9 @@ hdfeos5_swdefdimmap(VALUE mod, VALUE geodim, VALUE datadim, VALUE offset, VALUE
i_swathid=he5swath->swid;
Check_Type(geodim,T_STRING);
- Check_SafeStr(geodim);
+ SafeStringValue(geodim);
Check_Type(datadim,T_STRING);
- Check_SafeStr(datadim);
+ SafeStringValue(datadim);
Check_Type(offset,T_FIXNUM);
Check_Type(increment,T_FIXNUM);
@@ -605,9 +615,9 @@ hdfeos5_swdefidxmap(VALUE mod, VALUE geodim, VALUE datadim, VALUE index)
i_swathid=he5swath->swid;
Check_Type(geodim,T_STRING);
- Check_SafeStr(geodim);
+ SafeStringValue(geodim);
Check_Type(datadim,T_STRING);
- Check_SafeStr(datadim);
+ SafeStringValue(datadim);
if ((TYPE(index) == T_BIGNUM) || (TYPE(index) == T_FIXNUM)) {
index = rb_Array(index);
}
@@ -664,7 +674,7 @@ hdfeos5_swdefcomp(VALUE mod, VALUE compcode, VALUE compparm)
i_swathid=he5swath->swid;
Check_Type(compcode,T_STRING);
- Check_SafeStr(compcode);
+ SafeStringValue(compcode);
if ((TYPE(compparm) == T_BIGNUM) || (TYPE(compparm) == T_FIXNUM)) {
compparm = rb_Array(compparm);
}
@@ -694,7 +704,7 @@ hdfeos5_swdefcomchunk(VALUE mod, VALUE compcode, VALUE compparm, VALUE rank, VAL
i_swathid=he5swath->swid;
Check_Type(compcode,T_STRING);
- Check_SafeStr(compcode);
+ SafeStringValue(compcode);
if ((TYPE(compparm) == T_BIGNUM) || (TYPE(compparm) == T_FIXNUM)) {
compparm = rb_Array(compparm);
}
@@ -734,13 +744,13 @@ hdfeos5_swdefgeofield(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdimli
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(maxdimlist,T_STRING);
- Check_SafeStr(maxdimlist);
+ SafeStringValue(maxdimlist);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
Check_Type(merge,T_FIXNUM);
i_fieldname = RSTRING_PTR(fieldname);
@@ -776,13 +786,13 @@ hdfeos5_swdefdatafield(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdiml
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(maxdimlist,T_STRING);
- Check_SafeStr(maxdimlist);
+ SafeStringValue(maxdimlist);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
Check_Type(merge,T_FIXNUM);
i_fieldname = RSTRING_PTR(fieldname);
@@ -816,7 +826,7 @@ hdfeos5_swwritedatameta(VALUE mod, VALUE dimlist, VALUE mvalue)
i_swathid=he5field->swid;
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(mvalue,T_FIXNUM);
i_dimlist = RSTRING_PTR(dimlist);
@@ -845,7 +855,7 @@ hdfeos5_swwritegeometa(VALUE mod, VALUE dimlist, VALUE mvalue)
i_swathid=he5field->swid;
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(mvalue,T_FIXNUM);
i_dimlist = RSTRING_PTR(dimlist);
@@ -874,9 +884,9 @@ hdfeos5_swwriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -908,7 +918,7 @@ hdfeos5_sw_get_att(VALUE mod, VALUE attrname)
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_SWattrinfo(i_swathid, i_attrname, &o_ntype, &o_count);
@@ -1156,11 +1166,11 @@ hdfeos5_swinqdatatype(VALUE mod, VALUE fieldname, VALUE attrname, VALUE group)
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(group,T_STRING);
- Check_SafeStr(group);
+ SafeStringValue(group);
i_fieldname = RSTRING_PTR(fieldname);
i_attrname = RSTRING_PTR(attrname);
@@ -1192,7 +1202,7 @@ hdfeos5_swnentries(VALUE mod, VALUE entrycode)
i_swathid=he5swath->swid;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
i_entrycode = change_entrycode(RSTRING_PTR(entrycode));
o_count = HE5_SWnentries(i_swathid, i_entrycode, &o_strbufsize);
@@ -1237,7 +1247,7 @@ hdfeos5_swwritefield(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE dat
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -1288,7 +1298,7 @@ hdfeos5_swreadfield(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE ntyp
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -1410,7 +1420,7 @@ hdfeos5_swdefboxregion(VALUE mod, VALUE cornerlon, VALUE cornerlat, VALUE mode)
cornerlat = rb_Array(cornerlat);
}
Check_Type(mode,T_STRING);
- Check_SafeStr(mode);
+ SafeStringValue(mode);
i_mode = change_subsetmode(RSTRING_PTR(mode));
i_cornerlon = hdfeos5_obj2cfloatary(cornerlon);
i_cornerlat = hdfeos5_obj2cfloatary(cornerlat);
@@ -1448,7 +1458,7 @@ hdfeos5_swregionindex(VALUE mod, VALUE cornerlon, VALUE cornerlat, VALUE mode)
cornerlat = rb_Array(cornerlat);
}
Check_Type(mode,T_STRING);
- Check_SafeStr(mode);
+ SafeStringValue(mode);
i_mode = change_subsetmode(RSTRING_PTR(mode));
i_cornerlon = hdfeos5_obj2cfloatary(cornerlon);
@@ -1487,7 +1497,7 @@ hdfeos5_swdeftimeperiod(VALUE mod, VALUE starttime, VALUE stoptime, VALUE mode)
stoptime = rb_funcall(stoptime, rb_intern("to_f"), 0);
}
Check_Type(mode,T_STRING);
- Check_SafeStr(mode);
+ SafeStringValue(mode);
i_mode = change_subsetmode(RSTRING_PTR(mode));
i_starttime = (double)NUM2DBL(starttime);
@@ -1517,7 +1527,7 @@ hdfeos5_swextractregion(VALUE mod, VALUE regionid, VALUE externalflag)
Check_Type(regionid,T_FIXNUM);
Check_Type(externalflag,T_STRING);
- Check_SafeStr(externalflag);
+ SafeStringValue(externalflag);
i_regionid = NUM2INT(regionid);
i_externalflag = change_subsetmode(RSTRING_PTR(externalflag));
@@ -1550,7 +1560,7 @@ hdfeos5_swextractperiod(VALUE mod, VALUE periodid, VALUE externalflag)
Check_Type(periodid,T_FIXNUM);
Check_Type(externalflag,T_STRING);
- Check_SafeStr(externalflag);
+ SafeStringValue(externalflag);
i_periodid = NUM2INT(periodid);
i_externalflag = change_subsetmode(RSTRING_PTR(externalflag));
@@ -1593,7 +1603,7 @@ hdfeos5_swdefvrtregion(VALUE mod, VALUE regionid, VALUE vertobj, VALUE range)
Check_Type(regionid,T_FIXNUM);
Check_Type(vertobj,T_STRING);
- Check_SafeStr(vertobj);
+ SafeStringValue(vertobj);
if (TYPE(range) == T_FLOAT) {
range = rb_Array(range);
}
@@ -1624,9 +1634,9 @@ hdfeos5_swsetfillvalue(VALUE mod, VALUE fieldname,VALUE numbertype, VALUE fillva
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
i_fieldname = RSTRING_PTR(fieldname);
i_numbertype = change_numbertype(RSTRING_PTR(numbertype));
@@ -1636,7 +1646,7 @@ hdfeos5_swsetfillvalue(VALUE mod, VALUE fieldname,VALUE numbertype, VALUE fillva
}
if (TYPE(fillval) == T_STRING) {
Check_Type(fillval,T_STRING);
- Check_SafeStr(fillval);
+ SafeStringValue(fillval);
i_fillval = RSTRING_PTR(fillval);
}
@@ -1662,7 +1672,7 @@ hdfeos5_swgetfillvalue(VALUE mod,VALUE fieldname)
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
o_fillval = (void*)malloc(HE5_BLKSIZE);
@@ -1816,7 +1826,7 @@ hdfeos5_swgeomapinfo(VALUE mod, VALUE geodim)
i_swathid=he5swath->swid;
Check_Type(geodim,T_STRING);
- Check_SafeStr(geodim);
+ SafeStringValue(geodim);
i_geodim = RSTRING_PTR(geodim);
o_rtn_val = HE5_SWgeomapinfo(i_swathid, i_geodim);
@@ -1843,9 +1853,9 @@ hdfeos5_swwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1877,7 +1887,7 @@ hdfeos5_sw_get_grpatt(VALUE mod, VALUE attrname)
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_SWgrpattrinfo(i_swathid, i_attrname, &o_ntype, &o_count);
@@ -1933,9 +1943,9 @@ hdfeos5_swwritegeogrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE cou
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
if (TYPE(datbuf) == T_FLOAT) {
datbuf = rb_Array(datbuf);
@@ -1969,7 +1979,7 @@ hdfeos5_sw_get_geogrpatt(VALUE mod, VALUE attrname)
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_SWgeogrpattrinfo(i_swathid, i_attrname, &o_ntype, &o_count);
@@ -2028,9 +2038,9 @@ hdfeos5_swwritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_swathid=he5field->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -2063,7 +2073,7 @@ hdfeos5_swfield_get_att(VALUE mod,VALUE attrname)
i_fieldname=he5field->name;
i_swathid=he5field->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_SWlocattrinfo(i_swathid, i_fieldname, i_attrname,
@@ -2125,13 +2135,13 @@ hdfeos5_prdefine(VALUE mod, VALUE profilename, VALUE dimlist, VALUE maxdimlist,
i_swathid=he5swath->swid;
Check_Type(profilename,T_STRING);
- Check_SafeStr(profilename);
+ SafeStringValue(profilename);
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(maxdimlist,T_STRING);
- Check_SafeStr(maxdimlist);
+ SafeStringValue(maxdimlist);
Check_Type(datatype_id,T_STRING);
- Check_SafeStr(datatype_id);
+ SafeStringValue(datatype_id);
i_profilename = RSTRING_PTR(profilename);
i_dimlist = RSTRING_PTR(dimlist);
@@ -2163,7 +2173,7 @@ hdfeos5_prwrite(VALUE mod, VALUE profilename, VALUE start, VALUE stride, VALUE e
i_swathid=he5swath->swid;
Check_Type(profilename,T_STRING);
- Check_SafeStr(profilename);
+ SafeStringValue(profilename);
start = rb_Array(start);
stride = rb_Array(stride);
edge = rb_Array(edge);
@@ -2205,7 +2215,7 @@ hdfeos5_prread(VALUE mod, VALUE profilename, VALUE start, VALUE stride, VALUE ed
i_swathid=he5swath->swid;
Check_Type(profilename,T_STRING);
- Check_SafeStr(profilename);
+ SafeStringValue(profilename);
start = rb_Array(start);
stride = rb_Array(stride);
edge = rb_Array(edge);
@@ -2240,7 +2250,7 @@ hdfeos5_prreclaimspace(VALUE mod, VALUE profilename)
i_swathid=he5swath->swid;
Check_Type(profilename,T_STRING);
- Check_SafeStr(profilename);
+ SafeStringValue(profilename);
i_profilename = RSTRING_PTR(profilename);
o_buffer = (void*)malloc(HE5_BLKSIZE);
@@ -2301,7 +2311,7 @@ hdfeos5_prinfo(VALUE mod, VALUE profilename)
i_swathid=he5swath->swid;
Check_Type(profilename,T_STRING);
- Check_SafeStr(profilename);
+ SafeStringValue(profilename);
i_profilename = RSTRING_PTR(profilename);
o_rtn_val = HE5_PRinfo(i_swathid, i_profilename, &o_rank, &o_dims, &o_maxdims, &o_ntype, o_dimlist, NULL);
@@ -2331,9 +2341,9 @@ hdfeos5_prwritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
if (TYPE(datbuf) == T_FLOAT) {
datbuf = rb_Array(datbuf);
@@ -2367,7 +2377,7 @@ hdfeos5_pr_get_grpatt(VALUE mod, VALUE attrname)
i_swathid=he5swath->swid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_PRgrpattrinfo(i_swathid, i_attrname, &o_ntype, &o_count);
@@ -2421,7 +2431,7 @@ hdfeos5_swsetalias(VALUE mod, VALUE fieldname)
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
o_rtn_val = HE5_SWsetalias(i_swathid, i_fieldname, o_aliaslist);
@@ -2445,9 +2455,9 @@ hdfeos5_swdropalias(VALUE mod, VALUE fldgroup, VALUE aliasname)
i_swathid=he5swath->swid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(aliasname,T_STRING);
- Check_SafeStr(aliasname);
+ SafeStringValue(aliasname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_aliasname = RSTRING_PTR(aliasname);
@@ -2499,9 +2509,9 @@ hdfeos5_swaliasinfo(VALUE mod, VALUE fldgroup, VALUE aliasname)
i_swathid=he5swath->swid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(aliasname,T_STRING);
- Check_SafeStr(aliasname);
+ SafeStringValue(aliasname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_aliasname = RSTRING_PTR(aliasname);
@@ -2531,7 +2541,7 @@ hdfeos5_swgetaliaslist(VALUE mod, VALUE fldgroup)
i_swathid=he5swath->swid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
o_rtn_val = HE5_SWgetaliaslist(i_swathid, i_fldgroup, o_aliaslist, &o_strbufsize);
@@ -2556,10 +2566,10 @@ hdfeos5_swfldrename(VALUE mod, VALUE oldfieldname,VALUE newfieldname)
i_swathid=he5swath->swid;
Check_Type(oldfieldname,T_STRING);
- Check_SafeStr(oldfieldname);
+ SafeStringValue(oldfieldname);
i_oldfieldname = RSTRING_PTR(oldfieldname);
Check_Type(newfieldname,T_STRING);
- Check_SafeStr(newfieldname);
+ SafeStringValue(newfieldname);
i_newfieldname = RSTRING_PTR(newfieldname);
@@ -2584,9 +2594,9 @@ hdfeos5_swmountexternal(VALUE mod, VALUE fldgroup, VALUE extfilename)
i_swathid=he5swath->swid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(extfilename,T_STRING);
- Check_SafeStr(extfilename);
+ SafeStringValue(extfilename);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_extfilename = RSTRING_PTR(extfilename);
@@ -2611,7 +2621,7 @@ hdfeos5_swunmount(VALUE mod, VALUE fldgroup, VALUE fileid)
i_swathid=he5swath->swid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(fileid,T_FIXNUM);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
@@ -2638,9 +2648,9 @@ hdfeos5_swreadexternal(VALUE mod, VALUE fldgroup, VALUE fieldname)
i_swathid=he5swath->swid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_fieldname = RSTRING_PTR(fieldname);
@@ -2667,7 +2677,7 @@ hdfeos5_swsetextdata(VALUE mod, VALUE filelist, VALUE offset, VALUE size)
i_swathid=he5swath->swid;
Check_Type(filelist,T_STRING);
- Check_SafeStr(filelist);
+ SafeStringValue(filelist);
if ((TYPE(offset) == T_BIGNUM) || (TYPE(offset) == T_FIXNUM)) {
offset = rb_Array(offset);
}
@@ -2707,7 +2717,7 @@ hdfeos5_swgetextdata(VALUE mod, VALUE fieldname)
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
@@ -2737,7 +2747,7 @@ hdfeos5_swindexinfo(VALUE mod, VALUE regionid, VALUE object)
Check_Type(regionid,T_FIXNUM);
Check_Type(object,T_STRING);
- Check_SafeStr(object);
+ SafeStringValue(object);
i_regionid = NUM2INT(regionid);
i_object = RSTRING_PTR(object);
@@ -2804,7 +2814,7 @@ hdfeos5_swsetfield(VALUE mod,VALUE fieldname)
i_swathid=he5swath->swid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
he5field = HE5SwField_init(i_fieldname, i_swathid, mod);
@@ -2936,12 +2946,12 @@ hdfeos5_swwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2956,11 +2966,11 @@ hdfeos5_swwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2978,11 +2988,11 @@ hdfeos5_swwritefield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3032,12 +3042,12 @@ hdfeos5_swwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3052,11 +3062,11 @@ hdfeos5_swwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3074,11 +3084,11 @@ hdfeos5_swwritefield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3128,12 +3138,12 @@ hdfeos5_swwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3148,11 +3158,11 @@ hdfeos5_swwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3170,11 +3180,11 @@ hdfeos5_swwritefield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3224,12 +3234,12 @@ hdfeos5_swwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3244,11 +3254,11 @@ hdfeos5_swwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3266,11 +3276,11 @@ hdfeos5_swwritefield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALU
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3320,12 +3330,12 @@ hdfeos5_swwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3340,11 +3350,11 @@ hdfeos5_swwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3362,11 +3372,11 @@ hdfeos5_swwritefield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge, VAL
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3416,12 +3426,12 @@ hdfeos5_swwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3436,11 +3446,11 @@ hdfeos5_swwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3458,11 +3468,11 @@ hdfeos5_swwritefield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge, VA
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3511,13 +3521,13 @@ hdfeos5_swreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3542,12 +3552,12 @@ hdfeos5_swreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3572,11 +3582,11 @@ hdfeos5_swreadfield_char(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3625,13 +3635,13 @@ hdfeos5_swreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3656,12 +3666,12 @@ hdfeos5_swreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3686,11 +3696,11 @@ hdfeos5_swreadfield_short(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3739,13 +3749,13 @@ hdfeos5_swreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3770,12 +3780,12 @@ hdfeos5_swreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3800,11 +3810,11 @@ hdfeos5_swreadfield_int(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3853,13 +3863,13 @@ hdfeos5_swreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3884,12 +3894,12 @@ hdfeos5_swreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3914,11 +3924,11 @@ hdfeos5_swreadfield_long(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -3967,13 +3977,13 @@ hdfeos5_swreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3998,12 +4008,12 @@ hdfeos5_swreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -4028,11 +4038,11 @@ hdfeos5_swreadfield_float(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
@@ -4081,13 +4091,13 @@ hdfeos5_swreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
status = HE5_SWfieldinfo(i_swathid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -4112,12 +4122,12 @@ hdfeos5_swreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -4142,11 +4152,11 @@ hdfeos5_swreadfield_double(VALUE mod, VALUE start, VALUE stride, VALUE edge)
break;
default:
Check_Type(edge,T_ARRAY);
- if(RARRAY(edge)->len <i_rank) {
+ if(RARRAY_LEN(edge) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_edge= NUM2INT(RARRAY(edge)->ptr[i_rank-1-i]);
+ l_edge= NUM2INT(RARRAY_PTR(edge)[i_rank-1-i]);
if(l_edge < 0) {
l_edge +=hs_dims[i];
}
diff --git a/hdfeos5za_wrap.c b/hdfeos5za_wrap.c
index adf9261..f26a809 100644
--- a/hdfeos5za_wrap.c
+++ b/hdfeos5za_wrap.c
@@ -5,8 +5,18 @@
#include "narray.h"
#include<string.h>
+/* for compatibility with ruby 1.6 */
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(a) (RARRAY(a)->ptr)
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) (RARRAY(a)->len)
+#endif
#ifndef RSTRING_PTR
-# define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(s) Check_SafeStr(s)
#endif
extern int check_numbertype(char *);
@@ -268,7 +278,7 @@ zanentries_count(hid_t i_zaid, VALUE entrycode)
long o_count;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
c_entrycode = RSTRING_PTR(entrycode);
o_count = HE5_ZAnentries(i_zaid, change_entrycode(c_entrycode), &o_strbufsize);
@@ -284,7 +294,7 @@ zanentries_strbuf(hid_t i_zaid, VALUE entrycode)
long o_count;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
c_entrycode = RSTRING_PTR(entrycode);
o_count = HE5_ZAnentries(i_zaid, change_entrycode(c_entrycode), &o_strbufsize);
@@ -309,7 +319,7 @@ hdfeos5_zacreate(VALUE mod, VALUE zaname)
file=he5file->name;
Check_Type(zaname,T_STRING);
- Check_SafeStr(zaname);
+ SafeStringValue(zaname);
i_zaname = RSTRING_PTR(zaname);
zaid = HE5_ZAcreate(i_fid, i_zaname);
@@ -335,7 +345,7 @@ hdfeos5_zaattach(VALUE mod, VALUE zaname)
i_fname=he5file->name;
Check_Type(zaname,T_STRING);
- Check_SafeStr(zaname);
+ SafeStringValue(zaname);
i_zaname = RSTRING_PTR(zaname);
zaid = HE5_ZAattach(i_fid, i_zaname);
@@ -360,7 +370,7 @@ hdfeos5_zadefdim(VALUE mod, VALUE dimname, VALUE dim)
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
Check_Type(dimname,T_STRING);
- Check_SafeStr(dimname);
+ SafeStringValue(dimname);
Check_Type(dim,T_FIXNUM);
i_dimname = RSTRING_PTR(dimname);
i_dim = NUM2LONG(dim);
@@ -383,7 +393,7 @@ hdfeos5_zadiminfo(VALUE mod, VALUE dimname)
i_zaid=he5za->zaid;
Check_Type(dimname,T_STRING);
- Check_SafeStr(dimname);
+ SafeStringValue(dimname);
i_dimname = RSTRING_PTR(dimname);
o_ndim = HE5_ZAdiminfo(i_zaid, i_dimname);
@@ -494,7 +504,7 @@ hdfeos5_zadefcomp(VALUE mod, VALUE compcode, VALUE compparm)
i_zaid=he5za->zaid;
Check_Type(compcode,T_STRING);
- Check_SafeStr(compcode);
+ SafeStringValue(compcode);
if ((TYPE(compparm) == T_BIGNUM) || (TYPE(compparm) == T_FIXNUM)) {
compparm = rb_Array(compparm);
}
@@ -524,7 +534,7 @@ hdfeos5_zadefcomchunk(VALUE mod, VALUE compcode, VALUE compparm, VALUE rank, VAL
i_zaid=he5za->zaid;
Check_Type(compcode,T_STRING);
- Check_SafeStr(compcode);
+ SafeStringValue(compcode);
if ((TYPE(compparm) == T_BIGNUM) || (TYPE(compparm) == T_FIXNUM)) {
compparm = rb_Array(compparm);
}
@@ -563,13 +573,13 @@ hdfeos5_zadefine(VALUE file, VALUE fieldname, VALUE dimlist, VALUE maxdimlist, V
i_zaid=he5za->zaid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(maxdimlist,T_STRING);
- Check_SafeStr(maxdimlist);
+ SafeStringValue(maxdimlist);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
i_fieldname = RSTRING_PTR(fieldname);
i_dimlist = RSTRING_PTR(dimlist);
@@ -601,7 +611,7 @@ hdfeos5_zawritedatameta(VALUE mod, VALUE dimlist, VALUE mvalue)
i_zaid=he5field->zaid;
Check_Type(dimlist,T_STRING);
- Check_SafeStr(dimlist);
+ SafeStringValue(dimlist);
Check_Type(mvalue,T_FIXNUM);
i_dimlist = RSTRING_PTR(dimlist);
@@ -631,9 +641,9 @@ hdfeos5_zawriteattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count, VA
i_zaid=he5za->zaid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -665,7 +675,7 @@ hdfeos5_za_get_att(VALUE mod, VALUE attrname)
i_zaid=he5za->zaid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_ZAattrinfo(i_zaid, i_attrname, &o_ntype, &o_count);
@@ -802,11 +812,11 @@ hdfeos5_zainqdatatype(VALUE mod, VALUE fieldname, VALUE attrname, VALUE group)
i_zaid=he5za->zaid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(group,T_STRING);
- Check_SafeStr(group);
+ SafeStringValue(group);
i_fieldname = RSTRING_PTR(fieldname);
i_attrname = RSTRING_PTR(attrname);
@@ -838,7 +848,7 @@ hdfeos5_zachunkinfo(VALUE mod, VALUE fldname)
Data_Get_Struct(mod, struct HE5Za, he5za);
i_zaid=he5za->zaid;
Check_Type(fldname,T_STRING);
- Check_SafeStr(fldname);
+ SafeStringValue(fldname);
i_fldname = RSTRING_PTR(fldname);
o_rtn_val = HE5_ZAchunkinfo(i_zaid, i_fldname, &o_chunk_rank, NULL);
@@ -869,7 +879,7 @@ hdfeos5_zanentries(VALUE mod, VALUE entrycode)
i_zaid=he5za->zaid;
Check_Type(entrycode,T_STRING);
- Check_SafeStr(entrycode);
+ SafeStringValue(entrycode);
i_entrycode = change_entrycode(RSTRING_PTR(entrycode));
o_count = HE5_ZAnentries(i_zaid, i_entrycode, &o_strbufsize);
@@ -914,7 +924,7 @@ hdfeos5_zawrite(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE data, V
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -965,7 +975,7 @@ hdfeos5_zaread(VALUE mod, VALUE start, VALUE stride, VALUE edge, VALUE ntype)
{
char *chk_ntype;
Check_Type(ntype,T_STRING);
- Check_SafeStr(ntype);
+ SafeStringValue(ntype);
chk_ntype = RSTRING_PTR(ntype);
switch (check_numbertype(chk_ntype)){
@@ -1081,9 +1091,9 @@ hdfeos5_zasetfillvalue(VALUE mod, VALUE fieldname,VALUE numbertype, VALUE fillva
i_zaid=he5za->zaid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
i_fieldname = RSTRING_PTR(fieldname);
i_numbertype = change_numbertype(RSTRING_PTR(numbertype));
@@ -1093,7 +1103,7 @@ hdfeos5_zasetfillvalue(VALUE mod, VALUE fieldname,VALUE numbertype, VALUE fillva
}
if (TYPE(fillval) == T_STRING) {
Check_Type(fillval,T_STRING);
- Check_SafeStr(fillval);
+ SafeStringValue(fillval);
i_fillval = RSTRING_PTR(fillval);
}
@@ -1119,7 +1129,7 @@ hdfeos5_zagetfillvalue(VALUE mod,VALUE fieldname)
i_zaid=he5za->zaid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
o_fillval = (void*)malloc(HE5_BLKSIZE);
@@ -1148,9 +1158,9 @@ hdfeos5_zawritegrpattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_zaid=he5za->zaid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1182,7 +1192,7 @@ hdfeos5_za_get_grpatt(VALUE mod, VALUE attrname)
i_zaid=he5za->zaid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_ZAgrpattrinfo(i_zaid, i_attrname, &o_ntype, &o_count);
@@ -1241,9 +1251,9 @@ hdfeos5_zawritelocattr(VALUE mod, VALUE attrname, VALUE numbertype, VALUE count,
i_zaid=he5field->zaid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
Check_Type(numbertype,T_STRING);
- Check_SafeStr(numbertype);
+ SafeStringValue(numbertype);
count = rb_Array(count);
i_attrname = RSTRING_PTR(attrname);
@@ -1277,7 +1287,7 @@ hdfeos5_zafield_get_att(VALUE mod,VALUE attrname)
i_fieldname=he5field->name;
i_zaid=he5field->zaid;
Check_Type(attrname,T_STRING);
- Check_SafeStr(attrname);
+ SafeStringValue(attrname);
i_attrname = RSTRING_PTR(attrname);
o_rtn_val = HE5_ZAlocattrinfo(i_zaid, i_fieldname, i_attrname,
@@ -1337,7 +1347,7 @@ hdfeos5_zasetalias(VALUE mod, VALUE fieldname)
i_zaid=he5za->zaid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
o_rtn_val = HE5_ZAsetalias(i_zaid, i_fieldname, o_aliaslist);
@@ -1361,9 +1371,9 @@ hdfeos5_zadropalias(VALUE mod, VALUE fldgroup, VALUE aliasname)
i_zaid=he5za->zaid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(aliasname,T_STRING);
- Check_SafeStr(aliasname);
+ SafeStringValue(aliasname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_aliasname = RSTRING_PTR(aliasname);
@@ -1416,9 +1426,9 @@ hdfeos5_zaaliasinfo(VALUE mod, VALUE fldgroup, VALUE aliasname)
i_zaid=he5za->zaid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(aliasname,T_STRING);
- Check_SafeStr(aliasname);
+ SafeStringValue(aliasname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_aliasname = RSTRING_PTR(aliasname);
@@ -1449,7 +1459,7 @@ hdfeos5_zagetaliaslist(VALUE mod, VALUE fldgroup)
i_zaid=he5za->zaid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
o_rtn_val = HE5_ZAgetaliaslist(i_zaid, i_fldgroup, o_aliaslist, &o_strbufsize);
@@ -1474,10 +1484,10 @@ hdfeos5_zafldrename(VALUE mod, VALUE oldfieldname,VALUE newfieldname)
i_zaid=he5za->zaid;
Check_Type(oldfieldname,T_STRING);
- Check_SafeStr(oldfieldname);
+ SafeStringValue(oldfieldname);
i_oldfieldname = RSTRING_PTR(oldfieldname);
Check_Type(newfieldname,T_STRING);
- Check_SafeStr(newfieldname);
+ SafeStringValue(newfieldname);
i_newfieldname = RSTRING_PTR(newfieldname);
@@ -1502,9 +1512,9 @@ hdfeos5_zamountexternal(VALUE mod, VALUE fldgroup, VALUE extfilename)
i_zaid=he5za->zaid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(extfilename,T_STRING);
- Check_SafeStr(extfilename);
+ SafeStringValue(extfilename);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_extfilename = RSTRING_PTR(extfilename);
@@ -1529,7 +1539,7 @@ hdfeos5_zaunmount(VALUE mod, VALUE fldgroup, VALUE fileid)
i_zaid=he5za->zaid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(fileid,T_FIXNUM);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
@@ -1556,9 +1566,9 @@ hdfeos5_zareadexternal(VALUE mod, VALUE fldgroup, VALUE fieldname)
i_zaid=he5za->zaid;
Check_Type(fldgroup,T_STRING);
- Check_SafeStr(fldgroup);
+ SafeStringValue(fldgroup);
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fldgroup = change_groupcode(RSTRING_PTR(fldgroup));
i_fieldname = RSTRING_PTR(fieldname);
@@ -1585,7 +1595,7 @@ hdfeos5_zasetextdata(VALUE mod, VALUE filelist, VALUE offset, VALUE size)
i_zaid=he5za->zaid;
Check_Type(filelist,T_STRING);
- Check_SafeStr(filelist);
+ SafeStringValue(filelist);
if ((TYPE(offset) == T_BIGNUM) || (TYPE(offset) == T_FIXNUM)) {
offset = rb_Array(offset);
}
@@ -1625,7 +1635,7 @@ hdfeos5_zagetextdata(VALUE mod, VALUE fieldname)
i_zaid=he5za->zaid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
@@ -1694,7 +1704,7 @@ hdfeos5_zasetfield(VALUE mod,VALUE fieldname)
i_zaid=he5za->zaid;
Check_Type(fieldname,T_STRING);
- Check_SafeStr(fieldname);
+ SafeStringValue(fieldname);
i_fieldname = RSTRING_PTR(fieldname);
he5field = HE5ZaField_init(i_fieldname, i_zaid, mod);
@@ -1826,12 +1836,12 @@ hdfeos5_zawrite_char(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -1846,11 +1856,11 @@ hdfeos5_zawrite_char(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -1868,11 +1878,11 @@ hdfeos5_zawrite_char(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -1922,12 +1932,12 @@ hdfeos5_zawrite_short(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -1942,11 +1952,11 @@ hdfeos5_zawrite_short(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -1964,11 +1974,11 @@ hdfeos5_zawrite_short(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2018,12 +2028,12 @@ hdfeos5_zawrite_int(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE dat
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2038,11 +2048,11 @@ hdfeos5_zawrite_int(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE dat
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2060,11 +2070,11 @@ hdfeos5_zawrite_int(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE dat
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2114,12 +2124,12 @@ hdfeos5_zawrite_long(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2134,11 +2144,11 @@ hdfeos5_zawrite_long(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2156,11 +2166,11 @@ hdfeos5_zawrite_long(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE da
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2210,12 +2220,12 @@ hdfeos5_zawrite_float(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2230,11 +2240,11 @@ hdfeos5_zawrite_float(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2252,11 +2262,11 @@ hdfeos5_zawrite_float(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE d
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2306,12 +2316,12 @@ hdfeos5_zawrite_double(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, o_dimlist, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2326,11 +2336,11 @@ hdfeos5_zawrite_double(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2348,11 +2358,11 @@ hdfeos5_zawrite_double(VALUE mod, VALUE start, VALUE stride, VALUE count, VALUE
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2401,13 +2411,13 @@ hdfeos5_zaread_char(VALUE mod, VALUE start, VALUE stride, VALUE count)
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2432,12 +2442,12 @@ hdfeos5_zaread_char(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2462,11 +2472,11 @@ hdfeos5_zaread_char(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i_rank-1-i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i_rank-1-i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2515,13 +2525,13 @@ hdfeos5_zaread_short(VALUE mod, VALUE start, VALUE stride, VALUE count)
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2546,12 +2556,12 @@ hdfeos5_zaread_short(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2576,11 +2586,11 @@ hdfeos5_zaread_short(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i_rank-1-i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i_rank-1-i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2629,13 +2639,13 @@ hdfeos5_zaread_int(VALUE mod, VALUE start, VALUE stride, VALUE count)
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2660,12 +2670,12 @@ hdfeos5_zaread_int(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2690,11 +2700,11 @@ hdfeos5_zaread_int(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i_rank-1-i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i_rank-1-i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2743,13 +2753,13 @@ hdfeos5_zaread_long(VALUE mod, VALUE start, VALUE stride, VALUE count)
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2774,12 +2784,12 @@ hdfeos5_zaread_long(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2804,11 +2814,11 @@ hdfeos5_zaread_long(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i_rank-1-i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i_rank-1-i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2857,13 +2867,13 @@ hdfeos5_zaread_float(VALUE mod, VALUE start, VALUE stride, VALUE count)
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -2888,12 +2898,12 @@ hdfeos5_zaread_float(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -2918,11 +2928,11 @@ hdfeos5_zaread_float(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i_rank-1-i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i_rank-1-i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
@@ -2971,13 +2981,13 @@ hdfeos5_zaread_double(VALUE mod, VALUE start, VALUE stride, VALUE count)
status = HE5_ZAinfo(i_zaid, i_fldname, &i_rank, hs_dims, &i_ntype, NULL, NULL);
Check_Type(start,T_ARRAY);
- if(RARRAY(start)->len < i_rank) {
+ if(RARRAY_LEN(start) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'start' is too short [%s:%d]",
__FILE__,__LINE__);
}
c_start=ALLOCA_N(signed long long,i_rank);
for(i=0; i<i_rank; i++){
- l_start=NUM2INT(RARRAY(start)->ptr[i_rank-1-i]);
+ l_start=NUM2INT(RARRAY_PTR(start)[i_rank-1-i]);
if(l_start < 0) {
l_start += hs_dims[i];
}
@@ -3002,12 +3012,12 @@ hdfeos5_zaread_double(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(stride,T_ARRAY);
- if(RARRAY(stride)->len < i_rank) {
+ if(RARRAY_LEN(stride) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'stride' is too short [%s:%d]",
__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- c_stride[i]=NUM2INT(RARRAY(stride)->ptr[i_rank-1-i]);
+ c_stride[i]=NUM2INT(RARRAY_PTR(stride)[i_rank-1-i]);
if(c_stride[i]==0) {
rb_raise(rb_eHE5Error, "stride cannot be zero [%s:%d]",__FILE__,__LINE__);
}
@@ -3032,11 +3042,11 @@ hdfeos5_zaread_double(VALUE mod, VALUE start, VALUE stride, VALUE count)
break;
default:
Check_Type(count,T_ARRAY);
- if(RARRAY(count)->len <i_rank) {
+ if(RARRAY_LEN(count) < i_rank) {
rb_raise(rb_eHE5Error, "Length of 'end' is too short [%s:%d]",__FILE__,__LINE__);
}
for(i=0; i<i_rank; i++){
- l_count= NUM2INT(RARRAY(count)->ptr[i_rank-1-i]);
+ l_count= NUM2INT(RARRAY_PTR(count)[i_rank-1-i]);
if(l_count < 0) {
l_count +=hs_dims[i];
}
diff --git a/test/test_pt.rb b/test/test_pt.rb
index e8793af..cfaa6ab 100644
--- a/test/test_pt.rb
+++ b/test/test_pt.rb
@@ -121,9 +121,9 @@ time= [100,110,120,130,140]
dname1.writelevel(count, time,"float")
dname1=point8.var("Latitude")
-count =[5]
-time = NArray.float(6)
-time = [10,10,20,30,40]
+count =[3]
+#time = NArray.float(6)
+time = [10,10,20]
dname1.writelevel(count, time,"float")
dname1=point8.var("DeployDate")
@@ -198,7 +198,7 @@ p file4.has_point?()
point8=file4.point("FixedBuoy point")
p point8.getlevelname()
dname1=point8.var("Temperature")
-p dname1.get_vars_float()
+p dname1.get_vars_float() # error message is shown but it's normal
dname1=point8.var("Latitude")
p dname1.get_vars_double()
dname1=point8.var("DeployDate")
@@ -211,7 +211,7 @@ p dname1.natts
p dname1.fieldinfo()
p dname1.get
p dname1.fwdlink
-p dname1.bcklink
+#p dname1.bcklink
point8.detach
point8=file4.point("FixedBuoy point")
@@ -233,8 +233,8 @@ p dname1.ndims
p dname1.dim_names
p dname1.natts
p dname1.fieldinfo()
-p dname1.get
-p dname1.get_vars_double()
+p dname1.get # error message is shown but it's normal
+p dname1.get_vars_double() # error message is shown but it's normal
point9.detach
file4.close
--
Ruby interface of HDF-EOS5 library
More information about the Pkg-grass-devel
mailing list