diff -r 9b71b537d175 -r bf23ba00db03 src/main.c
--- a/src/main.c	Mon Jun 30 08:51:26 2008 +0100
+++ b/src/main.c	Mon Jun 30 10:46:20 2008 +0100
@@ -59,7 +59,7 @@
 		iter = razor_package_iterator_create(set);
 		pattern = argv[i];
 		count = 0;
-		while (razor_package_iterator_next(iter, &package, RAZOR_DETAIL_NAME, &name, 0)) {
+		while (razor_package_iterator_next(iter, &package, RAZOR_DETAIL_NAME, &name, NULL)) {
 			if (fnmatch(pattern, name, 0) != 0)
 				continue;
 
@@ -87,7 +87,7 @@
 	while (razor_package_iterator_next(iter, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, 0)) {
+					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
 		if (flags & LIST_PACKAGES_ONLY_NAMES)
 			printf("%s\n", name);
 		else
@@ -431,7 +431,7 @@
 
 	pi = razor_package_iterator_create(set);
 	while (razor_package_iterator_next(pi, &package,
-					   RAZOR_DETAIL_NAME, &name, 0)) {
+					   RAZOR_DETAIL_NAME, &name, NULL)) {
 		if (pattern && fnmatch(pattern, name, 0) == 0) {
 			razor_transaction_update_package(trans, package);
 			matches++;
@@ -452,7 +452,7 @@
 	int matches = 0;
 
 	pi = razor_package_iterator_create(set);
-	while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, 0)) {
+	while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, NULL)) {
 		if (pattern && fnmatch(pattern, name, 0) == 0) {
 			razor_transaction_remove_package(trans, package);
 			matches++;
@@ -662,7 +662,7 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, 0)) {
+					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
 		snprintf(url, sizeof url,
 			 "%s/Packages/%s",
 			 yum_url, rpm_filename(name, version, arch));
@@ -694,7 +694,7 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, 0)) {
+					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
 		printf("install %s-%s\n", name, version);
 
 		snprintf(file, sizeof file,
@@ -802,7 +802,7 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, 0)) {
+					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
 		if (pattern && fnmatch(pattern, name, 0) != 0)
 			continue;
 
@@ -845,7 +845,7 @@
 	while (razor_package_iterator_next(pi, &package,
 					   RAZOR_DETAIL_NAME, &name,
 					   RAZOR_DETAIL_VERSION, &version,
-					   RAZOR_DETAIL_ARCH, &arch, 0)) {
+					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
 		if (pattern && fnmatch(pattern, name, 0) != 0)
 			continue;
 
@@ -854,7 +854,7 @@
 					   RAZOR_DETAIL_DESCRIPTION, &description,
 					   RAZOR_DETAIL_URL, &url,
 					   RAZOR_DETAIL_LICENSE, &license,
-					   0);
+					   NULL);
 
 		printf ("Name:        %s\n", name);
 		printf ("Arch:        %s\n", arch);
@@ -899,13 +899,18 @@
 
 	pi = razor_package_iterator_create(set);
 	while (razor_package_iterator_next(pi, &package,
-					   &name, &version, &arch)) {
+					   RAZOR_DETAIL_NAME, &name,
+					   RAZOR_DETAIL_VERSION, &version,
+					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
 		if (!fnmatch(pattern, name, 0))
 			printf("%s-%s.%s\n", name, version, arch);
 		else {
-			razor_package_get_details (set, package, &summary,
-						   &description, &url,
-						   &license);
+			razor_package_get_details (set, package,
+						   RAZOR_DETAIL_SUMMARY, &summary,
+						   RAZOR_DETAIL_DESCRIPTION, &description,
+						   RAZOR_DETAIL_URL, &url,
+						   RAZOR_DETAIL_LICENSE, &license,
+						   NULL);
 			if (!fnmatch(pattern, url, 0) ||
 			    !fnmatch(pattern, summary, 0) ||
 			    !fnmatch(pattern, description, 0))