1.1 --- a/src/main.c	Sat Jun 28 18:33:15 2008 -0400
     1.2 +++ b/src/main.c	Mon Jun 30 09:47:32 2008 +0100
     1.3 @@ -47,7 +47,7 @@
     1.4  	struct razor_package_query *query;
     1.5  	struct razor_package_iterator *iter;
     1.6  	struct razor_package *package;
     1.7 -	const char *name, *version, *arch, *pattern;
     1.8 +	const char *name, *pattern;
     1.9  	int i, count;
    1.10  
    1.11  	if (argc == 0)
    1.12 @@ -59,8 +59,7 @@
    1.13  		iter = razor_package_iterator_create(set);
    1.14  		pattern = argv[i];
    1.15  		count = 0;
    1.16 -		while (razor_package_iterator_next(iter, &package,
    1.17 -						   &name, &version, &arch)) {
    1.18 +		while (razor_package_iterator_next(iter, &package, RAZOR_DETAIL_NAME, &name, 0)) {
    1.19  			if (fnmatch(pattern, name, 0) != 0)
    1.20  				continue;
    1.21  
    1.22 @@ -86,7 +85,9 @@
    1.23  	const char *name, *version, *arch;
    1.24  
    1.25  	while (razor_package_iterator_next(iter, &package,
    1.26 -					   &name, &version, &arch)) {
    1.27 +					   RAZOR_DETAIL_NAME, &name,
    1.28 +					   RAZOR_DETAIL_VERSION, &version,
    1.29 +					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.30  		if (flags & LIST_PACKAGES_ONLY_NAMES)
    1.31  			printf("%s\n", name);
    1.32  		else
    1.33 @@ -425,12 +426,12 @@
    1.34  {
    1.35  	struct razor_package_iterator *pi;
    1.36  	struct razor_package *package;
    1.37 -	const char *name, *version, *arch;
    1.38 +	const char *name;
    1.39  	int matches = 0;
    1.40  
    1.41  	pi = razor_package_iterator_create(set);
    1.42  	while (razor_package_iterator_next(pi, &package,
    1.43 -					   &name, &version, &arch)) {
    1.44 +					   RAZOR_DETAIL_NAME, &name, 0)) {
    1.45  		if (pattern && fnmatch(pattern, name, 0) == 0) {
    1.46  			razor_transaction_update_package(trans, package);
    1.47  			matches++;
    1.48 @@ -447,12 +448,11 @@
    1.49  {
    1.50  	struct razor_package_iterator *pi;
    1.51  	struct razor_package *package;
    1.52 -	const char *name, *version, *arch;
    1.53 +	const char *name;
    1.54  	int matches = 0;
    1.55  
    1.56  	pi = razor_package_iterator_create(set);
    1.57 -	while (razor_package_iterator_next(pi, &package,
    1.58 -					   &name, &version, &arch)) {
    1.59 +	while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, 0)) {
    1.60  		if (pattern && fnmatch(pattern, name, 0) == 0) {
    1.61  			razor_transaction_remove_package(trans, package);
    1.62  			matches++;
    1.63 @@ -660,7 +660,9 @@
    1.64  	pi = razor_set_create_install_iterator(system, next);
    1.65  	errors = 0;
    1.66  	while (razor_package_iterator_next(pi, &package,
    1.67 -					   &name, &version, &arch)) {
    1.68 +					   RAZOR_DETAIL_NAME, &name,
    1.69 +					   RAZOR_DETAIL_VERSION, &version,
    1.70 +					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.71  		snprintf(url, sizeof url,
    1.72  			 "%s/Packages/%s",
    1.73  			 yum_url, rpm_filename(name, version, arch));
    1.74 @@ -690,7 +692,9 @@
    1.75  
    1.76  	pi = razor_set_create_install_iterator(system, next);
    1.77  	while (razor_package_iterator_next(pi, &package,
    1.78 -					   &name, &version, &arch)) {
    1.79 +					   RAZOR_DETAIL_NAME, &name,
    1.80 +					   RAZOR_DETAIL_VERSION, &version,
    1.81 +					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.82  		printf("install %s-%s\n", name, version);
    1.83  
    1.84  		snprintf(file, sizeof file,
    1.85 @@ -796,7 +800,9 @@
    1.86  	set = razor_set_open(rawhide_repo_filename);
    1.87  	pi = razor_package_iterator_create(set);
    1.88  	while (razor_package_iterator_next(pi, &package,
    1.89 -					   &name, &version, &arch)) {
    1.90 +					   RAZOR_DETAIL_NAME, &name,
    1.91 +					   RAZOR_DETAIL_VERSION, &version,
    1.92 +					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.93  		if (pattern && fnmatch(pattern, name, 0) != 0)
    1.94  			continue;
    1.95  
    1.96 @@ -837,12 +843,18 @@
    1.97  		return 1;
    1.98  	pi = razor_package_iterator_create(set);
    1.99  	while (razor_package_iterator_next(pi, &package,
   1.100 -					   &name, &version, &arch)) {
   1.101 +					   RAZOR_DETAIL_NAME, &name,
   1.102 +					   RAZOR_DETAIL_VERSION, &version,
   1.103 +					   RAZOR_DETAIL_ARCH, &arch, 0)) {
   1.104  		if (pattern && fnmatch(pattern, name, 0) != 0)
   1.105  			continue;
   1.106  
   1.107 -		razor_package_get_details (set, package, &summary, &description,
   1.108 -					   &url, &license);
   1.109 +		razor_package_get_details (set, package,
   1.110 +					   RAZOR_DETAIL_SUMMARY, &summary,
   1.111 +					   RAZOR_DETAIL_DESCRIPTION, &description,
   1.112 +					   RAZOR_DETAIL_URL, &url,
   1.113 +					   RAZOR_DETAIL_LICENSE, &license,
   1.114 +					   0);
   1.115  
   1.116  		printf ("Name:        %s\n", name);
   1.117  		printf ("Arch:        %s\n", arch);