ruby-rpm 1.2.4 → 1.3.0

data/{ChangeLog → CHANGELOG.rdoc}

@@ -1,3 +1,10 @@
+2010-08-19  Duncan Mac-Vicar P. <dmacvicar@suse.de>
+
+  * build system cleanup
+  * use rake-compiler to build extension
+  * bundler (>= 1.0pre) & Gemfile support
+  * ruby 1.9 support
+
 2009-10-20  Duncan Mac-Vicar P. <dmacvicar@suse.de>
 
   * port to rpm 4.7. Still should work with older versions

data/README.rdoc

@@ -0,0 +1,40 @@
+= RPM bindings for ruby
+
+* http://www.gitorious.org/ruby-rpm
+
+== Introduction
+
+Ruby/RPM is an interface to access RPM database for Ruby.
+  
+== Requirements
+
+* ruby 1.8+
+* gcc
+* rpm 4.0.0 or newer (tested on 4.0.4 and 4.2.1)
+
+== Installation
+
+* gem install rpm
+
+== Building
+
+If you want to automatically install required gems, make sure to
+have bundler 1.x installed
+
+* gem instal bundler
+* gem build rpm.gemspec
+
+== Usage
+
+require 'rpm'
+  
+== License
+
+GPLv2. See COPYING file.
+
+== Credits
+
+* Kenta MURATA <muraken@kondara.org>
+* David Lutterkort <dlutter@redhat.com>
+* Duncan Mac-Vicar P. <dmacvicar@suse.de>
+

data/ext/rpm/db.c

@@ -71,7 +71,7 @@ db_s_open(int argc, VALUE* argv, VALUE obj)
 			if (TYPE(argv[1]) != T_STRING) {
 				rb_raise(rb_eTypeError, "illegal argument type");
 			}
-			root = RSTRING(argv[1])->ptr;
+			root = RSTRING_PTR(argv[1]);
 		}
 		writable = RTEST(argv[0]);
 		break;
@@ -85,8 +85,8 @@ db_s_open(int argc, VALUE* argv, VALUE obj)
 	if (rpmdbOpen(root, &(rdb->db), writable ? O_RDWR | O_CREAT : O_RDONLY, 0644)) {
 		free(rdb);
 		rb_raise(rb_eRuntimeError, "can not open database in %s",
-				 RSTRING(rb_str_concat(rb_str_new2(root),
-			         rb_str_new2("/var/lib/rpm")))->ptr);
+				 RSTRING_PTR(rb_str_concat(rb_str_new2(root),
+			         rb_str_new2("/var/lib/rpm"))));
 	}
 
 	rdb->ref_count = 0;
@@ -121,7 +121,7 @@ db_s_init(int argc, VALUE* argv, VALUE obj)
 		if (TYPE(argv[0]) != T_STRING) {
 			rb_raise(rb_eTypeError, "illegal argument type");
 		}
-		root = RSTRING(argv[0])->ptr;
+		root = RSTRING_PTR(argv[0]);
 		if (argc == 2) {
 			writable = RTEST(argv[1]);
 		}
@@ -133,8 +133,8 @@ db_s_init(int argc, VALUE* argv, VALUE obj)
 
 	if (rpmdbInit(root, writable ? O_RDWR | O_CREAT : O_RDONLY)) {
 		rb_raise(rb_eRuntimeError, "can not initialize database in %s",
-				 RSTRING(rb_str_concat(rb_str_new2(root),
-									   rb_str_new2("/var/lib/rpm")))->ptr);
+				 RSTRING_PTR(rb_str_concat(rb_str_new2(root),
+									   rb_str_new2("/var/lib/rpm"))));
 	}
 
 	return Qnil;
@@ -164,7 +164,7 @@ db_s_rebuild(int argc, VALUE* argv, VALUE obj)
 			if (TYPE(argv[0]) != T_STRING) {
 				rb_raise(rb_eTypeError, "illegal argument type");
 			}
-			root = RSTRING(argv[0])->ptr;
+			root = RSTRING_PTR(argv[0]);
 		}
 		break;
 
@@ -180,8 +180,8 @@ db_s_rebuild(int argc, VALUE* argv, VALUE obj)
 #endif
 	if (ret) {
 		rb_raise(rb_eRuntimeError, "can not rebuild database in %s",
-				 RSTRING(rb_str_concat(rb_str_new2(root),
-									   rb_str_new2("/var/lib/rpm")))->ptr);
+				 RSTRING_PTR(rb_str_concat(rb_str_new2(root),
+									   rb_str_new2("/var/lib/rpm"))));
 	}
 
 	return Qnil;
@@ -311,7 +311,7 @@ rpm_db_transaction(int argc, VALUE* argv, VALUE db)
 		if (TYPE(argv[0]) != T_STRING) {
 			rb_raise(rb_eTypeError, "illegal argument type");
 		}
-		root = RSTRING(argv[0])->ptr;
+		root = RSTRING_PTR(argv[0]);
 		break;
 
 	default:
@@ -393,10 +393,10 @@ rpm_transaction_install(VALUE trans, VALUE pkg, VALUE key)
 
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
 	rpmtransAddPackage(RPM_TRANSACTION(trans), RPM_HEADER(pkg), NULL,
-					   RSTRING(key)->ptr, 0, NULL);
+					   RSTRING_PTR(key), 0, NULL);
 #else
 	rpmtsAddInstallElement(RPM_TRANSACTION(trans), RPM_HEADER(pkg),
-					   RSTRING(key)->ptr, 0, NULL);
+					   RSTRING_PTR(key), 0, NULL);
 #endif
 
 	return Qnil;
@@ -423,10 +423,10 @@ rpm_transaction_upgrade(VALUE trans, VALUE pkg, VALUE key)
 	rb_ary_push(keys, key);
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
 	rpmtransAddPackage(RPM_TRANSACTION(trans), RPM_HEADER(pkg), NULL,
-					   RSTRING(key)->ptr, 1, NULL);
+					   RSTRING_PTR(key), 1, NULL);
 #else
 	rpmtsAddInstallElement(RPM_TRANSACTION(trans), RPM_HEADER(pkg),
-					   RSTRING(key)->ptr, 1, NULL);
+					   RSTRING_PTR(key), 1, NULL);
 #endif
 
 	return Qnil;
@@ -455,7 +455,7 @@ rpm_transaction_available(VALUE trans, VALUE pkg, VALUE key)
 
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
 	rpmtransAvailablePackage(RPM_TRANSACTION(trans), RPM_HEADER(pkg),
-					   RSTRING(key)->ptr);
+					   RSTRING_PTR(key));
 #else
     rb_raise(rb_eNotImpError, "need rpmtsAvailablePackage");
     // FIXME: What is the analog for rpmtsAvailablePackage
@@ -571,7 +571,7 @@ package_new_from_NEVR(const char* nevr)
 {
 	char *name = NULL;
 	char *evr = NULL;
-	char *end = NULL;
+    char *end = NULL;
 	char *tmp_nevr = NULL;
 	VALUE package = Qnil;
 	int i=0;
@@ -591,11 +591,11 @@ package_new_from_NEVR(const char* nevr)
 	if ( i==2 ) {
 		*end = '\0'; evr = end + 1;
 	} else {
-		evr = "";
+		evr = NULL;
 	}
 
 	package = rpm_package_new_from_N_EVR(rb_str_new2(name),
-					     version_new_from_EVR(evr));
+                                         version_new_from_EVR(evr ? evr : ""));
 	free(tmp_nevr);
 	return package;
 }
@@ -667,7 +667,7 @@ rpm_transaction_check(VALUE trans)
 
 			char *name = buf+2;
 			char *relation = NULL;
-			char *evr = "";
+			char *evr = NULL;
 			rpmsenseFlags sense_flags = 0;
 
 			end = strchr ( name, ' ');
@@ -691,7 +691,7 @@ rpm_transaction_check(VALUE trans)
 			}
 
 			dep = rpm_require_new(name,
-					  rpm_version_new(evr),
+                                  rpm_version_new(evr ? evr : ""),
 					  sense_flags,
 					  package_new_from_NEVR(
 						rpmProblemGetPkgNEVR(p)
@@ -1049,8 +1049,8 @@ rpm_db_init_iterator(VALUE db, VALUE key, VALUE val)
 
 	mi = ALLOC_N(rpm_mi_t,1);
 	if ((mi->mi = rpmdbInitIterator(RPM_DB(db), NUM2INT(rb_Integer(key)),
-						   NIL_P(val) ? NULL : RSTRING(val)->ptr,
-                           NIL_P(val) ? 0 : RSTRING(val)->len))){
+						   NIL_P(val) ? NULL : RSTRING_PTR(val),
+                           NIL_P(val) ? 0 : RSTRING_LEN(val)))){
 		mi->db = (rpm_db_t*)DATA_PTR(db);
 		db_ref(mi->db);
 		return Data_Wrap_Struct(rpm_cMatchIterator, NULL, mi_free, mi);
@@ -1092,7 +1092,7 @@ rpm_mi_set_iterator_re(VALUE mi,VALUE tag, VALUE mode, VALUE re)
 	if (TYPE(re) != T_STRING)
 		rb_raise(rb_eTypeError, "illegal argument type");
 
-	rpmdbSetIteratorRE(RPM_MI(mi),NUM2INT(tag),NUM2INT(mode),RSTRING(re)->ptr);
+	rpmdbSetIteratorRE(RPM_MI(mi),NUM2INT(tag),NUM2INT(mode),RSTRING_PTR(re));
 	return mi;
 }
 
@@ -1104,16 +1104,16 @@ rpm_mi_set_iterator_version(VALUE mi, VALUE version)
 	if (rb_obj_is_kind_of(version, rpm_cVersion) == Qfalse)
 		rb_raise(rb_eTypeError, "illegal argument type");
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
-	rpmdbSetIteratorVersion(RPM_MI(mi),RSTRING(rpm_version_get_v(version))->ptr);
+	rpmdbSetIteratorVersion(RPM_MI(mi),RSTRING_PTR(rpm_version_get_v(version)));
 #else
-	rpmdbSetIteratorRE(RPM_MI(mi),RPMTAG_VERSION,RPMMIRE_DEFAULT,RSTRING(rpm_version_get_v(version))->ptr);
+	rpmdbSetIteratorRE(RPM_MI(mi),RPMTAG_VERSION,RPMMIRE_DEFAULT,RSTRING_PTR(rpm_version_get_v(version)));
 #endif
 	r = rpm_version_get_r(version);
 	if(!NIL_P(r)){
 #if RPM_VERSION_CODE < RPM_VERSION(4,1,0)
-		rpmdbSetIteratorRelease(RPM_MI(mi),RSTRING(r)->ptr);
+		rpmdbSetIteratorRelease(RPM_MI(mi),RSTRING_PTR(r));
 #else
-		rpmdbSetIteratorRE(RPM_MI(mi),RPMTAG_RELEASE,RPMMIRE_DEFAULT,RSTRING(r)->ptr);
+		rpmdbSetIteratorRE(RPM_MI(mi),RPMTAG_RELEASE,RPMMIRE_DEFAULT,RSTRING_PTR(r));
 #endif
 	}
 	return mi;

data/ext/rpm/dependency.c

@@ -179,17 +179,17 @@ rpm_dependency_is_satisfy(VALUE dep,VALUE other)
 		return Qfalse;
 	}
 
-	name = RSTRING(rb_ivar_get(dep,id_name))->ptr;
-	svre = RSTRING(rpm_version_to_vre(rb_ivar_get(dep,id_ver)))->ptr;
+	name = RSTRING_PTR(rb_ivar_get(dep,id_name));
+	svre = RSTRING_PTR(rpm_version_to_vre(rb_ivar_get(dep,id_ver)));
     sflag = NUM2INT(rb_ivar_get(dep, id_flags));
 
 	if (rb_obj_is_kind_of(other,rpm_cDependency) == Qtrue){
 		oflag = NUM2INT(rb_ivar_get(other, id_flags));
-        oname = RSTRING(rb_ivar_get(other, id_name))->ptr;
-		ovre = RSTRING(rpm_version_to_vre(rb_ivar_get(other,id_ver)))->ptr;
+        oname = RSTRING_PTR(rb_ivar_get(other, id_name));
+		ovre = RSTRING_PTR(rpm_version_to_vre(rb_ivar_get(other,id_ver)));
 		other = rb_ivar_get(other,id_ver);
 	} else if (rb_obj_is_kind_of(other,rpm_cVersion) == Qtrue){
-		ovre = RSTRING(rpm_version_to_vre(other))->ptr;
+		ovre = RSTRING_PTR(rpm_version_to_vre(other));
         oname = name;
 		if (!*ovre)
 			oflag = 0;

data/ext/rpm/extconf.rb

@@ -99,4 +99,4 @@ $CFLAGS="#{$CFLAGS} -Werror -Wno-deprecated-declarations"
 system 'gcc -MM *.c >depend 2>/dev/null'
 
 create_header
-create_makefile('rpmmodule')
+create_makefile('rpm')

data/ext/rpm/file.c

@@ -36,7 +36,7 @@ file_initialize(VALUE file, VALUE path, VALUE md5sum, VALUE link_to,
 	}
 	rb_ivar_set(file, id_path, path);
 	rb_ivar_set(file, id_md5sum, md5sum);
-	rb_ivar_set(file, id_link_to, (!NIL_P(link_to) && RSTRING(link_to)->len) ? link_to : Qnil);
+	rb_ivar_set(file, id_link_to, (!NIL_P(link_to) && RSTRING_LEN(link_to)) ? link_to : Qnil);
 	rb_ivar_set(file, id_size, rb_Integer(size));
 	if (rb_obj_is_kind_of(mtime, rb_cTime) == Qfalse) {
 		mtime = rb_time_new(NUM2INT(rb_Integer(mtime)), (time_t)0);

data/ext/rpm/package.c

@@ -50,7 +50,7 @@ package_free(Header hdr)
 	headerFree(hdr);
 }
 
-static VALUE inline
+inline static VALUE
 package_new_from_header(VALUE klass, Header hdr)
 {
 	VALUE p;
@@ -93,9 +93,9 @@ package_s_create(VALUE klass, VALUE name, VALUE version)
 	}
 
 	hdr = headerNew();
-        headerAddEntry(hdr,RPMTAG_NAME,RPM_STRING_TYPE,RSTRING(name)->ptr,1);
-        headerAddEntry(hdr,RPMTAG_VERSION,RPM_STRING_TYPE,RSTRING(rpm_version_get_v(version))->ptr,1);
-        headerAddEntry(hdr,RPMTAG_RELEASE,RPM_STRING_TYPE,RSTRING(rpm_version_get_r(version))->ptr,1);
+        headerAddEntry(hdr,RPMTAG_NAME,RPM_STRING_TYPE,RSTRING_PTR(name),1);
+        headerAddEntry(hdr,RPMTAG_VERSION,RPM_STRING_TYPE,RSTRING_PTR(rpm_version_get_v(version)),1);
+        headerAddEntry(hdr,RPMTAG_RELEASE,RPM_STRING_TYPE,RSTRING_PTR(rpm_version_get_r(version)),1);
         if(!NIL_P(rpm_version_get_e(version))){
 		int e = NUM2INT(rpm_version_get_e(version));
         	headerAddEntry(hdr,RPMTAG_EPOCH,RPM_INT32_TYPE,&e,1);
@@ -133,13 +133,13 @@ package_s_open(VALUE klass, VALUE filename)
 		rb_raise(rb_eTypeError, "illegal argument type");
 	}
 
-	fd = Fopen(RSTRING(filename)->ptr, "r");
+	fd = Fopen(RSTRING_PTR((filename)), "r");
 	if (!fd) {
 		rb_raise(rb_eRuntimeError, "can not open file %s",
-				 RSTRING(filename)->ptr);
+				 RSTRING_PTR((filename)));
 	}
 
-    rc = read_header_from_file(fd, RSTRING(filename)->ptr, &hdr);
+    rc = read_header_from_file(fd, RSTRING_PTR((filename)), &hdr);
 	Fclose(fd);
 
 	switch (rc) {
@@ -188,12 +188,12 @@ package_s_load(VALUE klass, VALUE str)
 	Check_Type(str, T_STRING);
 
 	temp = ruby_rpm_make_temp_name();
-	fd = Fopen(RSTRING(temp)->ptr, "wb+");
-	Fwrite(RSTRING(str)->ptr, RSTRING(str)->len, 1, fd);
+	fd = Fopen(RSTRING_PTR((temp)), "wb+");
+	Fwrite(RSTRING_PTR((str)), RSTRING_LEN(str), 1, fd);
 	Fseek(fd, 0, SEEK_SET);
 	hdr = headerRead(fd, HEADER_MAGIC_YES);
 	Fclose(fd);
-	unlink(RSTRING(temp)->ptr);
+	unlink(RSTRING_PTR((temp)));
 
 	if (!hdr) {
 		rb_raise(rb_eArgError, "unable load RPM::Package");
@@ -254,8 +254,8 @@ rpm_package_add_dependency(VALUE pkg,VALUE dep)
 	versiontag = NUM2INT(rpm_dependency_get_versiontag(dep));
 	flagstag = NUM2INT(rpm_dependency_get_flagstag(dep));
 
-	name = RSTRING(rpm_dependency_get_name(dep))->ptr;
-	evr = RSTRING(rpm_version_to_vre(rpm_dependency_get_version(dep)))->ptr;
+	name = RSTRING_PTR((rpm_dependency_get_name(dep)));
+	evr = RSTRING_PTR((rpm_version_to_vre(rpm_dependency_get_version(dep))));
 	flag = NUM2INT(rpm_dependency_get_flags(dep));
 
 	headerAddOrAppendEntry(RPM_HEADER(pkg),nametag,RPM_STRING_ARRAY_TYPE,&name,1);
@@ -288,7 +288,7 @@ rpm_package_add_string_array(VALUE pkg,VALUE tag,VALUE val)
 	if ((TYPE(val) != T_STRING))  {
 		rb_raise(rb_eTypeError, "illegal argument type");
 	}
-	headerAddOrAppendEntry(RPM_HEADER(pkg),NUM2INT(tag),RPM_STRING_ARRAY_TYPE,&RSTRING(val)->ptr,1);
+	headerAddOrAppendEntry(RPM_HEADER(pkg),NUM2INT(tag),RPM_STRING_ARRAY_TYPE,RARRAY_PTR(val),1);
   return Qnil;
 }
 
@@ -298,7 +298,7 @@ rpm_package_add_string(VALUE pkg,VALUE tag,VALUE val)
 	if ((TYPE(val) != T_STRING))  {
 		rb_raise(rb_eTypeError, "illegal argument type");
 	}
-	headerAddEntry(RPM_HEADER(pkg),NUM2INT(tag),RPM_STRING_TYPE,RSTRING(val)->ptr,1);
+	headerAddEntry(RPM_HEADER(pkg),NUM2INT(tag),RPM_STRING_TYPE,RSTRING_PTR((val)),1);
   return Qnil;
 }
 
@@ -308,7 +308,7 @@ rpm_package_add_binary(VALUE pkg,VALUE tag,VALUE val)
 	if ((TYPE(val) != T_STRING))  {
 		rb_raise(rb_eTypeError, "illegal argument type");
 	}
-	headerAddEntry(RPM_HEADER(pkg),NUM2INT(tag),RPM_BIN_TYPE,RSTRING(val)->ptr,RSTRING(val)->len);
+	headerAddEntry(RPM_HEADER(pkg),NUM2INT(tag),RPM_BIN_TYPE,RSTRING_PTR((val)),RSTRING_LEN(val));
   return Qnil;
 }
 
@@ -700,35 +700,35 @@ rpm_package_get_files(VALUE pkg)
 
 	files = rb_ary_new();
 	if (!NIL_P(basenames)) {
-		for (i = 0; i < RARRAY(basenames)->len; i++) {
+		for (i = 0; i < RARRAY_LEN(basenames); i++) {
 			static char buf[BUFSIZ];
 			VALUE file;
 			buf[0] = '\0';
-			stpcpy(stpcpy(buf, RSTRING(RARRAY(dirnames)->ptr[
-				           NUM2INT(RARRAY(diridxs)->ptr[i])])->ptr),
-					   RSTRING(RARRAY(basenames)->ptr[i])->ptr);
+			stpcpy(stpcpy(buf, RSTRING_PTR((RARRAY_PTR(dirnames))[
+				           NUM2INT(RARRAY_PTR(diridxs)[i])])),
+					   RSTRING_PTR((RARRAY_PTR(basenames)[i])));
 			file = rpm_file_new(
 				buf,
-				RSTRING(RARRAY(md5list)->ptr[i])->ptr,
+				RSTRING_PTR((RARRAY_PTR(md5list)[i])),
 				(NIL_P(linklist)
 				 ? NULL
-				 : RSTRING(RARRAY(linklist)->ptr[i])->ptr),
-				NUM2UINT(RARRAY(sizelist)->ptr[i]),
-				NUM2INT(RARRAY(mtimelist)->ptr[i]),
+				 : RSTRING_PTR((RARRAY_PTR(linklist)[i]))),
+				NUM2UINT(RARRAY_PTR(sizelist)[i]),
+				NUM2INT(RARRAY_PTR(mtimelist)[i]),
 				(NIL_P(ownerlist)
 				 ? NULL
-				 : RSTRING(RARRAY(ownerlist)->ptr[i])->ptr),
+				 : RSTRING_PTR((RARRAY_PTR(ownerlist)[i]))),
 				(NIL_P(grouplist)
 				 ? NULL
-				 : RSTRING(RARRAY(grouplist)->ptr[i])->ptr),
-				NUM2UINT(RARRAY(rdevlist)->ptr[i]),
-				NUM2UINT(RARRAY(modelist)->ptr[i]),
+				 : RSTRING_PTR((RARRAY_PTR(grouplist)[i]))),
+				NUM2UINT(RARRAY_PTR(rdevlist)[i]),
+				NUM2UINT(RARRAY_PTR(modelist)[i]),
 				(NIL_P(flaglist)
 				 ? RPMFILE_NONE
-				 : NUM2INT(RARRAY(flaglist)->ptr[i])),
+				 : NUM2INT(RARRAY_PTR(flaglist)[i])),
 				(NIL_P(statelist)
 				 ? RPMFILE_STATE_NORMAL
-				 : NUM2INT(RARRAY(statelist)->ptr[i])));
+				 : NUM2INT(RARRAY_PTR(statelist)[i])));
 			rb_ary_push(files, file);
 		}
 	}
@@ -925,7 +925,7 @@ rpm_package_dump(VALUE pkg)
 	char* buf;
 
 	temp = ruby_rpm_make_temp_name();
-	fd = Fopen(RSTRING(temp)->ptr, "wb+");
+	fd = Fopen(RSTRING_PTR((temp)), "wb+");
 	headerWrite(fd, RPM_HEADER(pkg), HEADER_MAGIC_YES);
 	size = fdSize(fd);
 
@@ -934,7 +934,7 @@ rpm_package_dump(VALUE pkg)
 	munmap(buf, size);
 
 	Fclose(fd);
-	unlink(RSTRING(temp)->ptr);
+	unlink(RSTRING_PTR((temp)));
 
 	return dump;
 }
@@ -956,16 +956,16 @@ rpm_package_to_s(VALUE pkg)
 	if (NIL_P(name)) {
 		buf[0] = '\0';
 	} else if (NIL_P(ver)) {
-		snprintf(buf, BUFSIZ, "%s", RSTRING(name)->ptr);
+		snprintf(buf, BUFSIZ, "%s", RSTRING_PTR((name)));
 	} else if (NIL_P(arch)) {
 		snprintf(buf, BUFSIZ, "%s-%s",
-				RSTRING(name)->ptr,
-				RSTRING(rpm_version_to_s(ver))->ptr);
+				RSTRING_PTR((name)),
+				RSTRING_PTR((rpm_version_to_s(ver))));
 	} else {
 		snprintf(buf, BUFSIZ, "%s-%s-%s",
-				RSTRING(name)->ptr,
-				RSTRING(rpm_version_to_s(ver))->ptr,
-				RSTRING(arch)->ptr);
+				RSTRING_PTR((name)),
+				RSTRING_PTR((rpm_version_to_s(ver))),
+				RSTRING_PTR((arch)));
 	}
 
 	return rb_str_new2(buf);
@@ -982,11 +982,11 @@ rpm_package_inspect(VALUE pkg)
 		buf[0] = '\0';
 	} else if (NIL_P(ver)) {
 		snprintf(buf, BUFSIZ, "#<RPM::Package name=%s>",
-				RSTRING(rb_inspect(name))->ptr);
+				RSTRING_PTR((rb_inspect(name))));
 	} else {
 		snprintf(buf, BUFSIZ, "#<RPM::Package name=%s, version=%s>",
-				RSTRING(rb_inspect(name))->ptr,
-				RSTRING(rb_inspect(ver))->ptr);
+				RSTRING_PTR((rb_inspect(name))),
+				RSTRING_PTR((rb_inspect(ver))));
 	}
 
 	return rb_str_new2(buf);