zipruby 0.2.8 → 0.2.9

data/zipruby.c

@@ -151,16 +151,16 @@ static int write_from_proc(VALUE proc, int fd) {
       break;
     }
 
-    if (RSTRING(src)->len < 1) {
+    if (RSTRING_LEN(src) < 1) {
       break;
     }
 
 #ifdef _WIN32
-    if (_write(fd, StringValuePtr(src), RSTRING(src)->len) == -1) {
+    if (_write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
       return -1;
     }
 #else
-    if (write(fd, StringValuePtr(src), RSTRING(src)->len) == -1) {
+    if (write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
       return -1;
     }
 #endif
@@ -214,15 +214,15 @@ static VALUE zipruby_archive_fopen(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_get_stat(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_buffer(VALUE self, VALUE name, VALUE source);
 static VALUE zipruby_archive_add_file(int argc, VALUE *argv, VALUE self);
-static VALUE zipruby_archive_add_filep(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_add_io(VALUE self, VALUE name, VALUE io);
 static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_replace_buffer(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_replace_file(int argc, VALUE* argv, VALUE self);
-static VALUE zipruby_archive_replace_filep(VALUE self, VALUE index, VALUE file);
+static VALUE zipruby_archive_replace_io(int argc, VALUE* argv, VALUE self);
 static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_or_replace_buffer(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE self);
-static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_add_or_replace_io(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_update(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_get_comment(int argc, VALUE *argv, VALUE self);
@@ -264,18 +264,18 @@ void Init_zipruby_archive() {
   rb_define_method(Archive, "get_stat", zipruby_archive_get_stat, -1);
   rb_define_method(Archive, "add_buffer", zipruby_archive_add_buffer, 2);
   rb_define_method(Archive, "add_file", zipruby_archive_add_file, -1);
-  rb_define_method(Archive, "add_filep", zipruby_archive_add_filep, -1);
+  rb_define_method(Archive, "add_io", zipruby_archive_add_io, 2);
   rb_define_method(Archive, "add", zipruby_archive_add_function, -1);
   rb_define_method(Archive, "replace_buffer", zipruby_archive_replace_buffer, -1);
   rb_define_method(Archive, "replace_file", zipruby_archive_replace_file, -1);
-  rb_define_method(Archive, "replace_filep", zipruby_archive_replace_filep, 2);
+  rb_define_method(Archive, "replace_io", zipruby_archive_replace_io, -1);
   rb_define_method(Archive, "replace", zipruby_archive_replace_function, -1);
   rb_define_method(Archive, "add_or_replace_buffer", zipruby_archive_add_or_replace_buffer, -1);
   rb_define_method(Archive, "add_or_replace_file", zipruby_archive_add_or_replace_file, -1);
-  rb_define_method(Archive, "add_or_replace_filep", zipruby_archive_add_or_replace_filep, -1);
+  rb_define_method(Archive, "add_or_replace_io", zipruby_archive_add_or_replace_io, -1);
   rb_define_method(Archive, "add_or_replace", zipruby_archive_add_or_replace_function, -1);
   rb_define_method(Archive, "update", zipruby_archive_update, -1);
-  rb_define_method(Archive, "<<", zipruby_archive_add_filep, -1);
+  rb_define_method(Archive, "<<", zipruby_archive_add_io, 2);
   rb_define_method(Archive, "get_comment", zipruby_archive_get_comment, -1);
   rb_define_method(Archive, "comment", zipruby_archive_get_comment, -1);
   rb_define_method(Archive, "comment=", zipruby_archive_set_comment, 1);
@@ -341,10 +341,10 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
   archive = rb_funcall(Archive, rb_intern("new"), 0);
   Data_Get_Struct(archive, struct zipruby_archive, p_archive);
 
-  if ((p_archive->archive = zip_open(StringValuePtr(path), i_flags, &errorp)) == NULL) {
+  if ((p_archive->archive = zip_open(RSTRING_PTR(path), i_flags, &errorp)) == NULL) {
     char errstr[ERRSTR_BUFSIZE];
     zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
-    rb_raise(Error, "Open archive failed - %s: %s", StringValuePtr(path), errstr);
+    rb_raise(Error, "Open archive failed - %s: %s", RSTRING_PTR(path), errstr);
   }
 
   p_archive->path = path;
@@ -374,7 +374,7 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
   struct zipruby_archive *p_archive;
   void *data = NULL;
   int len = 0, i_flags = 0;
-  int errorp;
+  int errorp;
 
   rb_scan_args(argc, argv, "02", &buffer, &flags);
 
@@ -394,8 +394,8 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
 
     i_flags = (i_flags | ZIP_TRUNC);
   } else if (TYPE(buffer) == T_STRING) {
-    data = StringValuePtr(buffer);
-    len = RSTRING(buffer)->len;
+    data = RSTRING_PTR(buffer);
+    len = RSTRING_LEN(buffer);
   } else if (rb_obj_is_instance_of(buffer, rb_cProc)) {
     data = (void *) buffer;
     len = -1;
@@ -439,60 +439,66 @@ static VALUE zipruby_archive_s_open_buffer(int argc, VALUE *argv, VALUE self) {
 
 /* */
 static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
+  int res;
   int errorp, wrongpwd;
   long pwdlen;
 
   Check_Type(path, T_STRING);
   Check_Type(password, T_STRING);
-  pwdlen = RSTRING(password)->len;
+  pwdlen = RSTRING_LEN(password);
 
   if (pwdlen < 1) {
-    rb_raise(Error, "Decrypt archive failed - %s: Password is empty", StringValuePtr(path));
+    rb_raise(Error, "Decrypt archive failed - %s: Password is empty", RSTRING_PTR(path));
   } else if (pwdlen > 0xff) {
-    rb_raise(Error, "Decrypt archive failed - %s: Password is too long", StringValuePtr(path));
+    rb_raise(Error, "Decrypt archive failed - %s: Password is too long", RSTRING_PTR(path));
   }
 
-  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp, &wrongpwd) == -1) {
+  res = zip_decrypt(RSTRING_PTR(path), RSTRING_PTR(password), pwdlen, &errorp, &wrongpwd);
+
+  if (res == -1) {
     if (wrongpwd) {
-      rb_raise(Error, "Decrypt archive failed - %s: Wrong password", StringValuePtr(path));
+      rb_raise(Error, "Decrypt archive failed - %s: Wrong password", RSTRING_PTR(path));
     } else {
       char errstr[ERRSTR_BUFSIZE];
       zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
-      rb_raise(Error, "Decrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+      rb_raise(Error, "Decrypt archive failed - %s: %s", RSTRING_PTR(path), errstr);
     }
   }
 
-  return Qnil;
+  return (res > 0) ? Qtrue : Qfalse;
 }
 
 /* */
 static VALUE zipruby_archive_s_encrypt(VALUE self, VALUE path, VALUE password) {
+  int res;
   int errorp;
   long pwdlen;
 
   Check_Type(path, T_STRING);
   Check_Type(password, T_STRING);
-  pwdlen = RSTRING(password)->len;
+  pwdlen = RSTRING_LEN(password);
 
   if (pwdlen < 1) {
-    rb_raise(Error, "Encrypt archive failed - %s: Password is empty", StringValuePtr(path));
+    rb_raise(Error, "Encrypt archive failed - %s: Password is empty", RSTRING_PTR(path));
   } else if (pwdlen > 0xff) {
-    rb_raise(Error, "Encrypt archive failed - %s: Password is too long", StringValuePtr(path));
+    rb_raise(Error, "Encrypt archive failed - %s: Password is too long", RSTRING_PTR(path));
   }
 
-  if (zip_encrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp) == -1) {
+  res = zip_encrypt(RSTRING_PTR(path), RSTRING_PTR(password), pwdlen, &errorp);
+
+  if (res == -1) {
     char errstr[ERRSTR_BUFSIZE];
     zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
-    rb_raise(Error, "Encrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+    rb_raise(Error, "Encrypt archive failed - %s: %s", RSTRING_PTR(path), errstr);
   }
 
-  return Qnil;
+  return (res > 0) ? Qtrue : Qfalse;
 }
 
 /* */
 static VALUE zipruby_archive_close(VALUE self) {
   struct zipruby_archive *p_archive;
-  int changed, survivors;
+  int changed, survivors;
 
   if (!zipruby_archive_is_open(self)) {
     return Qfalse;
@@ -601,25 +607,25 @@ static VALUE zipruby_archive_add_buffer(VALUE self, VALUE name, VALUE source) {
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  len = RSTRING(source)->len;
+  len = RSTRING_LEN(source);
 
   if ((data = malloc(len)) == NULL) {
     rb_raise(rb_eRuntimeError, "Add file failed: Cannot allocate memory");
   }
 
   memset(data, 0, len);
-  memcpy(data, StringValuePtr(source), len);
+  memcpy(data, RSTRING_PTR(source), len);
 
   if ((zsource = zip_source_buffer(p_archive->archive, data, len, 1)) == NULL) {
     free(data);
-    rb_raise(Error, "Add file failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+    rb_raise(Error, "Add file failed - %s: %s", RSTRING_PTR(name), zip_strerror(p_archive->archive));
   }
 
-  if (zip_add(p_archive->archive, StringValuePtr(name), zsource) == -1) {
+  if (zip_add(p_archive->archive, RSTRING_PTR(name), zsource) == -1) {
     zip_source_free(zsource);
     zip_unchange_all(p_archive->archive);
     zip_unchange_archive(p_archive->archive);
-    rb_raise(Error, "Add file failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+    rb_raise(Error, "Add file failed - %s: %s", RSTRING_PTR(name), zip_strerror(p_archive->archive));
   }
 
   return Qnil;
@@ -636,7 +642,7 @@ static VALUE zipruby_archive_replace_buffer(int argc, VALUE *argv, VALUE self) {
 
   rb_scan_args(argc, argv, "21", &index, &source, &flags);
 
-  if (!rb_obj_is_instance_of(index, rb_cString) && !rb_obj_is_instance_of(index, rb_cFixnum)) {
+  if (TYPE(index) != T_STRING && !FIXNUM_P(index)) {
     rb_raise(rb_eTypeError, "wrong argument type %s (expected Fixnum or String)", rb_class2name(CLASS_OF(index)));
   }
 
@@ -648,19 +654,19 @@ static VALUE zipruby_archive_replace_buffer(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  if (rb_obj_is_instance_of(index, rb_cFixnum)) {
+  if (FIXNUM_P(index)) {
     i_index = NUM2INT(index);
-  } else if ((i_index = zip_name_locate(p_archive->archive, StringValuePtr(index), i_flags)) == -1) {
-    rb_raise(Error, "Replace file failed - %s: Archive does not contain a file", StringValuePtr(index));
+  } else if ((i_index = zip_name_locate(p_archive->archive, RSTRING_PTR(index), i_flags)) == -1) {
+    rb_raise(Error, "Replace file failed - %s: Archive does not contain a file", RSTRING_PTR(index));
   }
 
-  len = RSTRING(source)->len;
+  len = RSTRING_LEN(source);
 
   if ((data = malloc(len)) == NULL) {
     rb_raise(rb_eRuntimeError, "Replace file failed: Cannot allocate memory");
   }
 
-  memcpy(data, StringValuePtr(source), len);
+  memcpy(data, RSTRING_PTR(source), len);
 
   if ((zsource = zip_source_buffer(p_archive->archive, data, len, 1)) == NULL) {
     free(data);
@@ -693,7 +699,7 @@ static VALUE zipruby_archive_add_or_replace_buffer(int argc, VALUE *argv, VALUE
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
+  index = zip_name_locate(p_archive->archive, RSTRING_PTR(name), i_flags);
 
   if (index >= 0) {
     VALUE _args[] = { INT2NUM(index), source };
@@ -726,15 +732,15 @@ static VALUE zipruby_archive_add_file(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  if ((zsource = zip_source_file(p_archive->archive, StringValuePtr(fname), 0, -1)) == NULL) {
-    rb_raise(Error, "Add file failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+  if ((zsource = zip_source_file(p_archive->archive, RSTRING_PTR(fname), 0, -1)) == NULL) {
+    rb_raise(Error, "Add file failed - %s: %s", RSTRING_PTR(name), zip_strerror(p_archive->archive));
   }
 
-  if (zip_add(p_archive->archive, StringValuePtr(name), zsource) == -1) {
+  if (zip_add(p_archive->archive, RSTRING_PTR(name), zsource) == -1) {
     zip_source_free(zsource);
     zip_unchange_all(p_archive->archive);
     zip_unchange_archive(p_archive->archive);
-    rb_raise(Error, "Add file failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+    rb_raise(Error, "Add file failed - %s: %s", RSTRING_PTR(name), zip_strerror(p_archive->archive));
   }
 
   return Qnil;
@@ -749,7 +755,7 @@ static VALUE zipruby_archive_replace_file(int argc, VALUE* argv, VALUE self) {
 
   rb_scan_args(argc, argv, "21", &index, &fname, &flags);
 
-  if (!rb_obj_is_instance_of(index, rb_cString) && !rb_obj_is_instance_of(index, rb_cFixnum)) {
+  if (TYPE(index) != T_STRING && !FIXNUM_P(index)) {
     rb_raise(rb_eTypeError, "wrong argument type %s (expected Fixnum or String)", rb_class2name(CLASS_OF(index)));
   }
 
@@ -761,13 +767,13 @@ static VALUE zipruby_archive_replace_file(int argc, VALUE* argv, VALUE self) {
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  if (rb_obj_is_instance_of(index, rb_cFixnum)) {
+  if (FIXNUM_P(index)) {
     i_index = NUM2INT(index);
-  } else if ((i_index = zip_name_locate(p_archive->archive, StringValuePtr(index), i_flags)) == -1) {
-    rb_raise(Error, "Replace file failed - %s: Archive does not contain a file", StringValuePtr(index));
+  } else if ((i_index = zip_name_locate(p_archive->archive, RSTRING_PTR(index), i_flags)) == -1) {
+    rb_raise(Error, "Replace file failed - %s: Archive does not contain a file", RSTRING_PTR(index));
   }
 
-  if ((zsource = zip_source_file(p_archive->archive, StringValuePtr(fname), 0, -1)) == NULL) {
+  if ((zsource = zip_source_file(p_archive->archive, RSTRING_PTR(fname), 0, -1)) == NULL) {
     rb_raise(Error, "Replace file failed at %d: %s", i_index, zip_strerror(p_archive->archive));
   }
 
@@ -813,7 +819,7 @@ static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE se
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
+  index = zip_name_locate(p_archive->archive, RSTRING_PTR(name), i_flags);
 
   if (index >= 0) {
     VALUE _args[] = { INT2NUM(index), fname };
@@ -825,63 +831,38 @@ static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE se
 }
 
 /* */
-static VALUE zipruby_archive_add_filep(int argc, VALUE *argv, VALUE self) {
-  VALUE name, file, source;
-
-  rb_scan_args(argc, argv, "11", &name, &file);
-
-  if (NIL_P(file)) {
-    file = name;
-    name = Qnil;
-  }
-
-  Check_Type(file, T_FILE);
-
-  if (NIL_P(name)) {
-    name = rb_funcall(rb_cFile, rb_intern("basename"), 1, rb_funcall(file, rb_intern("path"), 0));
-  }
+static VALUE zipruby_archive_add_io(VALUE self, VALUE name, VALUE io) {
+  VALUE source;
 
-  source = rb_funcall(file, rb_intern("read"), 0);
+  Check_IO(io);
+  source = rb_funcall(io, rb_intern("read"), 0);
 
   return zipruby_archive_add_buffer(self, name,  source);
 }
 
 /* */
-static VALUE zipruby_archive_replace_filep(VALUE self, VALUE index, VALUE file) {
-  VALUE source;
-  VALUE _args[2];
+static VALUE zipruby_archive_replace_io(int argc, VALUE *argv, VALUE self) {
+  VALUE source, io, index, flags;
+  VALUE _args[3];
 
-  Check_Type(file, T_FILE);
-  source = rb_funcall(file, rb_intern("read"), 0);
+  rb_scan_args(argc, argv, "21", &index, &io, &flags);
+  Check_IO(io);
+  source = rb_funcall(io, rb_intern("read"), 0);
 
   _args[0] = index;
   _args[1] = source;
-  return zipruby_archive_replace_buffer(2, _args, self);
+  _args[2] = flags;
+  return zipruby_archive_replace_file(2, _args, self);
 }
 
 /* */
-static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE self) {
-  VALUE name, file, flags;
+static VALUE zipruby_archive_add_or_replace_io(int argc, VALUE *argv, VALUE self) {
+  VALUE name, io, flags;
   struct zipruby_archive *p_archive;
   int index, i_flags = 0;
 
-  rb_scan_args(argc, argv, "12", &name, &file, &flags);
-
-  if (NIL_P(flags) && FIXNUM_P(file)) {
-    flags = file;
-    file = Qnil;
-  }
-
-  if (NIL_P(file)) {
-    file = name;
-    name = Qnil;
-  }
-
-  Check_Type(file, T_FILE);
-
-  if (NIL_P(name)) {
-    name = rb_funcall(rb_cFile, rb_intern("basename"), 1, rb_funcall(file, rb_intern("path"), 0));
-  }
+  rb_scan_args(argc, argv, "21", &name, &io, &flags);
+  Check_IO(io);
 
   if (!NIL_P(flags)) {
     i_flags = NUM2INT(flags);
@@ -891,13 +872,13 @@ static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE s
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
+  index = zip_name_locate(p_archive->archive, RSTRING_PTR(name), i_flags);
 
   if (index >= 0) {
-    return zipruby_archive_replace_filep(self, INT2NUM(index), file);
+    VALUE _args[] = {INT2NUM(index), io, flags};
+    return zipruby_archive_replace_io(2, _args, self);
   } else {
-    VALUE _args[] = { name, file };
-    return zipruby_archive_add_filep(2, _args, self);
+    return zipruby_archive_add_io(self ,name, io);
   }
 }
 
@@ -910,6 +891,7 @@ static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self) {
 
   rb_scan_args(argc, argv, "11", &name, &mtime);
   rb_need_block();
+  Check_Type(name, T_STRING);
 
   if (NIL_P(mtime)) {
     mtime = rb_funcall(rb_cTime, rb_intern("now"), 0);
@@ -923,7 +905,7 @@ static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self) {
   if ((z = malloc(sizeof(struct read_proc))) == NULL) {
     zip_unchange_all(p_archive->archive);
     zip_unchange_archive(p_archive->archive);
-    rb_raise(rb_eRuntimeError, "Add failed - %s: Cannot allocate memory", StringValuePtr(name));
+    rb_raise(rb_eRuntimeError, "Add failed - %s: Cannot allocate memory", RSTRING_PTR(name));
   }
 
   z->proc = rb_block_proc();
@@ -931,14 +913,14 @@ static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self) {
 
   if ((zsource = zip_source_proc(p_archive->archive, z)) == NULL) {
     free(z);
-    rb_raise(Error, "Add failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+    rb_raise(Error, "Add failed - %s: %s", RSTRING_PTR(name), zip_strerror(p_archive->archive));
   }
 
-  if (zip_add(p_archive->archive, StringValuePtr(name), zsource) == -1) {
+  if (zip_add(p_archive->archive, RSTRING_PTR(name), zsource) == -1) {
     zip_source_free(zsource);
     zip_unchange_all(p_archive->archive);
     zip_unchange_archive(p_archive->archive);
-    rb_raise(Error, "Add file failed - %s: %s", StringValuePtr(name), zip_strerror(p_archive->archive));
+    rb_raise(Error, "Add file failed - %s: %s", RSTRING_PTR(name), zip_strerror(p_archive->archive));
   }
 
   return Qnil;
@@ -1009,7 +991,7 @@ static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALU
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
+  index = zip_name_locate(p_archive->archive, RSTRING_PTR(name), i_flags);
 
   if (index >= 0) {
     VALUE _args[] = { INT2NUM(index), mtime };
@@ -1157,8 +1139,8 @@ static VALUE zipruby_archive_set_comment(VALUE self, VALUE comment) {
 
   if (!NIL_P(comment)) {
     Check_Type(comment, T_STRING);
-    s_comment = StringValuePtr(comment);
-    len = RSTRING(comment)->len;
+    s_comment = RSTRING_PTR(comment);
+    len = RSTRING_LEN(comment);
   }
 
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
@@ -1189,7 +1171,7 @@ static VALUE zipruby_archive_locate_name(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  return INT2NUM(zip_name_locate(p_archive->archive, StringValuePtr(fname), i_flags));
+  return INT2NUM(zip_name_locate(p_archive->archive, RSTRING_PTR(fname), i_flags));
 }
 
 /* */
@@ -1222,8 +1204,8 @@ static VALUE zipruby_archive_set_fcomment(VALUE self, VALUE index, VALUE comment
 
   if (!NIL_P(comment)) {
     Check_Type(comment, T_STRING);
-    s_comment = StringValuePtr(comment);
-    len = RSTRING(comment)->len;
+    s_comment = RSTRING_PTR(comment);
+    len = RSTRING_LEN(comment);
   }
 
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
@@ -1258,10 +1240,11 @@ static VALUE zipruby_archive_fdelete(VALUE self, VALUE index) {
 static VALUE zipruby_archive_frename(VALUE self, VALUE index, VALUE name) {
   struct zipruby_archive *p_archive;
 
+  Check_Type(name, T_STRING);
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
   Check_Archive(p_archive);
 
-  if (zip_rename(p_archive->archive, NUM2INT(index), StringValuePtr(name)) == -1) {
+  if (zip_rename(p_archive->archive, NUM2INT(index), RSTRING_PTR(name)) == -1) {
     zip_unchange_all(p_archive->archive);
     zip_unchange_archive(p_archive->archive);
     rb_raise(Error, "Rename file failed at %d: %s", NUM2INT(index), zip_strerror(p_archive->archive));
@@ -1350,7 +1333,7 @@ static VALUE zipruby_archive_each(VALUE self) {
 /* */
 static VALUE zipruby_archive_commit(VALUE self) {
   struct zipruby_archive *p_archive;
-  int changed, survivors;
+  int changed, survivors;
   int errorp;
 
   Data_Get_Struct(self, struct zipruby_archive, p_archive);
@@ -1371,7 +1354,7 @@ static VALUE zipruby_archive_commit(VALUE self) {
   p_archive->archive = NULL;
   p_archive->flags = (p_archive->flags & ~(ZIP_CREATE | ZIP_EXCL));
 
-  if ((p_archive->archive = zip_open(StringValuePtr(p_archive->path), p_archive->flags, &errorp)) == NULL) {
+  if ((p_archive->archive = zip_open(RSTRING_PTR(p_archive->path), p_archive->flags, &errorp)) == NULL) {
     char errstr[ERRSTR_BUFSIZE];
     zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
     rb_raise(Error, "Commit archive failed: %s", errstr);
@@ -1390,13 +1373,14 @@ static VALUE zipruby_archive_is_open(VALUE self) {
 
 /* */
 static VALUE zipruby_archive_decrypt(VALUE self, VALUE password) {
+  VALUE retval;
   struct zipruby_archive *p_archive;
   long pwdlen;
-  int changed, survivors;
+  int changed, survivors;
   int errorp;
 
   Check_Type(password, T_STRING);
-  pwdlen = RSTRING(password)->len;
+  pwdlen = RSTRING_LEN(password);
 
   if (pwdlen < 1) {
     rb_raise(Error, "Decrypt archive failed: Password is empty");
@@ -1422,26 +1406,27 @@ static VALUE zipruby_archive_decrypt(VALUE self, VALUE password) {
   p_archive->archive = NULL;
   p_archive->flags = (p_archive->flags & ~(ZIP_CREATE | ZIP_EXCL));
 
-  zipruby_archive_s_decrypt(Archive, p_archive->path, password);
+  retval = zipruby_archive_s_decrypt(Archive, p_archive->path, password);
 
-  if ((p_archive->archive = zip_open(StringValuePtr(p_archive->path), p_archive->flags, &errorp)) == NULL) {
+  if ((p_archive->archive = zip_open(RSTRING_PTR(p_archive->path), p_archive->flags, &errorp)) == NULL) {
     char errstr[ERRSTR_BUFSIZE];
     zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
     rb_raise(Error, "Decrypt archive failed: %s", errstr);
   }
 
-  return Qnil;
+  return retval;
 }
 
 /* */
 static VALUE zipruby_archive_encrypt(VALUE self, VALUE password) {
+  VALUE retval;
   struct zipruby_archive *p_archive;
   long pwdlen;
-  int changed, survivors;
+  int changed, survivors;
   int errorp;
 
   Check_Type(password, T_STRING);
-  pwdlen = RSTRING(password)->len;
+  pwdlen = RSTRING_LEN(password);
 
   if (pwdlen < 1) {
     rb_raise(Error, "Encrypt archive failed: Password is empty");
@@ -1467,17 +1452,18 @@ static VALUE zipruby_archive_encrypt(VALUE self, VALUE password) {
   p_archive->archive = NULL;
   p_archive->flags = (p_archive->flags & ~(ZIP_CREATE | ZIP_EXCL));
 
-  zipruby_archive_s_encrypt(Archive, p_archive->path, password);
+  retval = zipruby_archive_s_encrypt(Archive, p_archive->path, password);
 
-  if ((p_archive->archive = zip_open(StringValuePtr(p_archive->path), p_archive->flags, &errorp)) == NULL) {
+  if ((p_archive->archive = zip_open(RSTRING_PTR(p_archive->path), p_archive->flags, &errorp)) == NULL) {
     char errstr[ERRSTR_BUFSIZE];
     zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
     rb_raise(Error, "Encrypt archive failed: %s", errstr);
   }
 
-  return Qnil;
+  return retval;
 }
 
+/* */
 static VALUE zipruby_archive_read(VALUE self) {
   VALUE retval = Qnil;
   struct zipruby_archive *p_archive;
@@ -1491,17 +1477,17 @@ static VALUE zipruby_archive_read(VALUE self) {
   if (NIL_P(p_archive->path)) {
     rb_raise(rb_eRuntimeError, "invalid Zip::Archive");
   }
-
-#ifdef _WIN32
-  if (fopen_s(&fzip ,StringValuePtr(p_archive->path), "rb") != 0) {
+
+#ifdef _WIN32
+  if (fopen_s(&fzip, RSTRING_PTR(p_archive->path), "rb") != 0) {
     rb_raise(Error, "Read archive failed: Cannot open archive");
-  }
-#else
-  if ((fzip = fopen(StringValuePtr(p_archive->path), "rb")) == NULL) {
+  }
+#else
+  if ((fzip = fopen(RSTRING_PTR(p_archive->path), "rb")) == NULL) {
     rb_raise(Error, "Read archive failed: Cannot open archive");
-  }
-#endif
-
+  }
+#endif
+
   block_given = rb_block_given_p();
 
   while ((n = fread(buf, 1, sizeof(buf), fzip)) > 0) {
@@ -1519,10 +1505,10 @@ static VALUE zipruby_archive_read(VALUE self) {
 #ifdef RUBY_WIN32_H
 #undef fclose
   fclose(fzip);
-#define fclose(f) rb_w32_fclose(f)
-#else
+#define fclose(f) rb_w32_fclose(f)
+#else
   fclose(fzip);
-#endif
+#endif
 
   if (n == -1) {
     rb_raise(Error, "Read archive failed");
@@ -1646,7 +1632,7 @@ static VALUE zipruby_file_initialize(int argc, VALUE *argv, VALUE self) {
   }
 
   switch (TYPE(index)) {
-  case T_STRING: fname = StringValuePtr(index); break;
+  case T_STRING: fname = RSTRING_PTR(index); break;
   case T_FIXNUM: i_index = NUM2INT(index); break;
   default:
     rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Fixnum)", rb_class2name(CLASS_OF(index)));
@@ -1802,8 +1788,8 @@ static VALUE zipruby_file_set_comment(VALUE self, VALUE comment) {
 
   if (!NIL_P(comment)) {
     Check_Type(comment, T_STRING);
-    s_comment = StringValuePtr(comment);
-    len = RSTRING(comment)->len;
+    s_comment = RSTRING_PTR(comment);
+    len = RSTRING_LEN(comment);
   }
 
   Data_Get_Struct(self, struct zipruby_file, p_file);
@@ -1838,10 +1824,11 @@ static VALUE zipruby_file_delete(VALUE self) {
 static VALUE zipruby_file_rename(VALUE self, VALUE name) {
   struct zipruby_file *p_file;
 
+  Check_Type(name, T_STRING);
   Data_Get_Struct(self, struct zipruby_file, p_file);
   Check_File(p_file);
 
-  if (zip_rename(p_file->archive, p_file->sb->index, StringValuePtr(name)) == -1) {
+  if (zip_rename(p_file->archive, p_file->sb->index, RSTRING_PTR(name)) == -1) {
     zip_unchange_all(p_file->archive);
     zip_unchange_archive(p_file->archive);
     rb_raise(Error, "Rename file failed - %s: %s", p_file->sb->name, zip_strerror(p_file->archive));
@@ -2009,7 +1996,7 @@ static VALUE zipruby_stat_initialize(int argc, VALUE *argv, VALUE self) {
   }
 
   switch (TYPE(index)) {
-  case T_STRING: fname = StringValuePtr(index); break;
+  case T_STRING: fname = RSTRING_PTR(index); break;
   case T_FIXNUM: i_index = NUM2INT(index); break;
   default:
     rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Fixnum)", rb_class2name(CLASS_OF(index)));
@@ -2176,11 +2163,11 @@ static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cm
       return 0;
     }
 
-    n = RSTRING(src)->len;
+    n = RSTRING_LEN(src);
 
     if (n > 0) {
       n = (n > len) ? len : n;
-      memcpy(buf, StringValuePtr(src), n);
+      memcpy(buf, RSTRING_PTR(src), n);
     }
 
     return n;