1.1 --- a/src/main.c	Mon Jun 30 08:51:26 2008 +0100
     1.2 +++ b/src/main.c	Mon Jun 30 10:46:20 2008 +0100
     1.3 @@ -59,7 +59,7 @@
     1.4  		iter = razor_package_iterator_create(set);
     1.5  		pattern = argv[i];
     1.6  		count = 0;
     1.7 -		while (razor_package_iterator_next(iter, &package, RAZOR_DETAIL_NAME, &name, 0)) {
     1.8 +		while (razor_package_iterator_next(iter, &package, RAZOR_DETAIL_NAME, &name, NULL)) {
     1.9  			if (fnmatch(pattern, name, 0) != 0)
    1.10  				continue;
    1.11  
    1.12 @@ -87,7 +87,7 @@
    1.13  	while (razor_package_iterator_next(iter, &package,
    1.14  					   RAZOR_DETAIL_NAME, &name,
    1.15  					   RAZOR_DETAIL_VERSION, &version,
    1.16 -					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.17 +					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
    1.18  		if (flags & LIST_PACKAGES_ONLY_NAMES)
    1.19  			printf("%s\n", name);
    1.20  		else
    1.21 @@ -431,7 +431,7 @@
    1.22  
    1.23  	pi = razor_package_iterator_create(set);
    1.24  	while (razor_package_iterator_next(pi, &package,
    1.25 -					   RAZOR_DETAIL_NAME, &name, 0)) {
    1.26 +					   RAZOR_DETAIL_NAME, &name, NULL)) {
    1.27  		if (pattern && fnmatch(pattern, name, 0) == 0) {
    1.28  			razor_transaction_update_package(trans, package);
    1.29  			matches++;
    1.30 @@ -452,7 +452,7 @@
    1.31  	int matches = 0;
    1.32  
    1.33  	pi = razor_package_iterator_create(set);
    1.34 -	while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, 0)) {
    1.35 +	while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, NULL)) {
    1.36  		if (pattern && fnmatch(pattern, name, 0) == 0) {
    1.37  			razor_transaction_remove_package(trans, package);
    1.38  			matches++;
    1.39 @@ -662,7 +662,7 @@
    1.40  	while (razor_package_iterator_next(pi, &package,
    1.41  					   RAZOR_DETAIL_NAME, &name,
    1.42  					   RAZOR_DETAIL_VERSION, &version,
    1.43 -					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.44 +					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
    1.45  		snprintf(url, sizeof url,
    1.46  			 "%s/Packages/%s",
    1.47  			 yum_url, rpm_filename(name, version, arch));
    1.48 @@ -694,7 +694,7 @@
    1.49  	while (razor_package_iterator_next(pi, &package,
    1.50  					   RAZOR_DETAIL_NAME, &name,
    1.51  					   RAZOR_DETAIL_VERSION, &version,
    1.52 -					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.53 +					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
    1.54  		printf("install %s-%s\n", name, version);
    1.55  
    1.56  		snprintf(file, sizeof file,
    1.57 @@ -802,7 +802,7 @@
    1.58  	while (razor_package_iterator_next(pi, &package,
    1.59  					   RAZOR_DETAIL_NAME, &name,
    1.60  					   RAZOR_DETAIL_VERSION, &version,
    1.61 -					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.62 +					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
    1.63  		if (pattern && fnmatch(pattern, name, 0) != 0)
    1.64  			continue;
    1.65  
    1.66 @@ -845,7 +845,7 @@
    1.67  	while (razor_package_iterator_next(pi, &package,
    1.68  					   RAZOR_DETAIL_NAME, &name,
    1.69  					   RAZOR_DETAIL_VERSION, &version,
    1.70 -					   RAZOR_DETAIL_ARCH, &arch, 0)) {
    1.71 +					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
    1.72  		if (pattern && fnmatch(pattern, name, 0) != 0)
    1.73  			continue;
    1.74  
    1.75 @@ -854,7 +854,7 @@
    1.76  					   RAZOR_DETAIL_DESCRIPTION, &description,
    1.77  					   RAZOR_DETAIL_URL, &url,
    1.78  					   RAZOR_DETAIL_LICENSE, &license,
    1.79 -					   0);
    1.80 +					   NULL);
    1.81  
    1.82  		printf ("Name:        %s\n", name);
    1.83  		printf ("Arch:        %s\n", arch);
    1.84 @@ -899,13 +899,18 @@
    1.85  
    1.86  	pi = razor_package_iterator_create(set);
    1.87  	while (razor_package_iterator_next(pi, &package,
    1.88 -					   &name, &version, &arch)) {
    1.89 +					   RAZOR_DETAIL_NAME, &name,
    1.90 +					   RAZOR_DETAIL_VERSION, &version,
    1.91 +					   RAZOR_DETAIL_ARCH, &arch, NULL)) {
    1.92  		if (!fnmatch(pattern, name, 0))
    1.93  			printf("%s-%s.%s\n", name, version, arch);
    1.94  		else {
    1.95 -			razor_package_get_details (set, package, &summary,
    1.96 -						   &description, &url,
    1.97 -						   &license);
    1.98 +			razor_package_get_details (set, package,
    1.99 +						   RAZOR_DETAIL_SUMMARY, &summary,
   1.100 +						   RAZOR_DETAIL_DESCRIPTION, &description,
   1.101 +						   RAZOR_DETAIL_URL, &url,
   1.102 +						   RAZOR_DETAIL_LICENSE, &license,
   1.103 +						   NULL);
   1.104  			if (!fnmatch(pattern, url, 0) ||
   1.105  			    !fnmatch(pattern, summary, 0) ||
   1.106  			    !fnmatch(pattern, description, 0))