1.1 --- a/src/rpm.c	Thu Jun 26 18:15:59 2008 -0400
     1.2 +++ b/src/rpm.c	Mon Jun 30 08:51:26 2008 +0100
     1.3 @@ -303,7 +303,7 @@
     1.4  {
     1.5  	struct razor_package *package;
     1.6  	struct razor_package_iterator *pi;
     1.7 -	const char *name, *version, *arch;
     1.8 +	const char *name;
     1.9  	int i, cmp, errors;
    1.10  
    1.11  	qsort(argv, argc, sizeof(*argv), strcmpp);
    1.12 @@ -313,7 +313,7 @@
    1.13  	pi = razor_package_iterator_create(set);
    1.14  
    1.15  	while (razor_package_iterator_next(pi, &package,
    1.16 -					   &name, &version, &arch)) {
    1.17 +					   RAZOR_DETAIL_NAME, &name, 0)) {
    1.18  		while (cmp = strcmp(argv[i], name), cmp < 0 && i < argc) {
    1.19  			fprintf(stderr, "error: package %s is not installed\n",
    1.20  				argv[i]);
    1.21 @@ -417,8 +417,12 @@
    1.22  {
    1.23  	const char *summary, *description, *url, *license;
    1.24  
    1.25 -	razor_package_get_details(set, package, &summary, &description,
    1.26 -				  &url, &license);
    1.27 +	razor_package_get_details (set, package,
    1.28 +				   RAZOR_DETAIL_SUMMARY, &summary,
    1.29 +				   RAZOR_DETAIL_DESCRIPTION, &description,
    1.30 +				   RAZOR_DETAIL_URL, &url,
    1.31 +				   RAZOR_DETAIL_LICENSE, &license,
    1.32 +				   0);
    1.33  
    1.34  	printf("Name:        %s\n", name);
    1.35  	printf("Arch:        %s\n", arch);
    1.36 @@ -488,7 +492,9 @@
    1.37  	pi = get_query_packages(set, argc, argv);
    1.38  
    1.39  	while (razor_package_iterator_next(pi, &package,
    1.40 -					   &name, &version, &arch)) {
    1.41 +					   RAZOR_DETAIL_NAME, &name,
    1.42 +					   RAZOR_DETAIL_VERSION, &version,
    1.43 +					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.44  		if (option_conflicts)
    1.45  			print_package_properties(set, package,
    1.46  						 RAZOR_PROPERTY_CONFLICTS);
    1.47 @@ -540,7 +546,9 @@
    1.48  	pi = get_query_packages(set, argc, argv);
    1.49  
    1.50  	while (razor_package_iterator_next(pi, &package,
    1.51 -					   &name, &version, &arch)) {
    1.52 +					   RAZOR_DETAIL_NAME, &name,
    1.53 +					   RAZOR_DETAIL_VERSION, &version,
    1.54 +					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.55  		printf("verify %s-%s.%s - not implemented\n",
    1.56  		       name, version, arch);
    1.57  	}
    1.58 @@ -570,7 +578,6 @@
    1.59  	struct razor_package_query *query;
    1.60  	struct razor_package_iterator *pi;
    1.61  	struct razor_package *package;
    1.62 -	const char *name, *version, *arch;
    1.63  
    1.64  	if (argc == 0) {
    1.65  		printf("no packages given for erase\n");
    1.66 @@ -586,8 +593,7 @@
    1.67  	add_command_line_packages(set, query, argc, argv);
    1.68  
    1.69  	pi = razor_package_query_finish(query);
    1.70 -	while (razor_package_iterator_next(pi, &package,
    1.71 -					   &name, &version, &arch))
    1.72 +	while (razor_package_iterator_next(pi, &package, 0))
    1.73  		razor_transaction_remove_package(trans, package);
    1.74  	razor_package_iterator_destroy(pi);
    1.75  
    1.76 @@ -617,7 +623,6 @@
    1.77  	struct razor_transaction *trans;
    1.78  	struct razor_package_iterator *pi;
    1.79  	struct razor_package *package;
    1.80 -	const char *name, *version, *arch;
    1.81  
    1.82  	if (argc == 0) {
    1.83  		printf("no packages given for install\n");
    1.84 @@ -630,8 +635,7 @@
    1.85  	trans = razor_transaction_create(set, upstream);
    1.86  
    1.87  	pi = razor_package_iterator_create(upstream);
    1.88 -	while (razor_package_iterator_next(pi, &package,
    1.89 -					   &name, &version, &arch))
    1.90 +	while (razor_package_iterator_next(pi, &package, 0))
    1.91  		razor_transaction_install_package(trans, package);
    1.92  	razor_package_iterator_destroy(pi);
    1.93  
    1.94 @@ -661,7 +665,6 @@
    1.95  	struct razor_transaction *trans;
    1.96  	struct razor_package_iterator *pi;
    1.97  	struct razor_package *package;
    1.98 -	const char *name, *version, *arch;
    1.99  
   1.100  	if (argc == 0) {
   1.101  		printf("no packages given for update\n");
   1.102 @@ -674,8 +677,7 @@
   1.103  	trans = razor_transaction_create(set, upstream);
   1.104  
   1.105  	pi = razor_package_iterator_create(upstream);
   1.106 -	while (razor_package_iterator_next(pi, &package,
   1.107 -					   &name, &version, &arch))
   1.108 +	while (razor_package_iterator_next(pi, &package, 0))
   1.109  		razor_transaction_update_package(trans, package);
   1.110  	razor_package_iterator_destroy(pi);
   1.111