1.1 --- a/src/main.c Mon Jun 30 13:28:59 2008 -0400
1.2 +++ b/src/main.c Tue Jul 01 09:44:46 2008 -0400
1.3 @@ -61,7 +61,9 @@
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, NULL)) {
1.8 + while (razor_package_iterator_next(iter, &package,
1.9 + RAZOR_DETAIL_NAME, &name,
1.10 + RAZOR_DETAIL_LAST)) {
1.11 if (fnmatch(pattern, name, 0) != 0)
1.12 continue;
1.13
1.14 @@ -89,7 +91,8 @@
1.15 while (razor_package_iterator_next(iter, &package,
1.16 RAZOR_DETAIL_NAME, &name,
1.17 RAZOR_DETAIL_VERSION, &version,
1.18 - RAZOR_DETAIL_ARCH, &arch, NULL)) {
1.19 + RAZOR_DETAIL_ARCH, &arch,
1.20 + RAZOR_DETAIL_LAST)) {
1.21 if (flags & LIST_PACKAGES_ONLY_NAMES)
1.22 printf("%s\n", name);
1.23 else
1.24 @@ -167,7 +170,10 @@
1.25 set = razor_set_open(repo_filename);
1.26 pi = create_iterator_from_argv(set, argc, argv);
1.27 while (razor_package_iterator_next(pi, &package,
1.28 - &name, &version, &arch))
1.29 + RAZOR_DETAIL_NAME, &name,
1.30 + RAZOR_DETAIL_VERSION, &version,
1.31 + RAZOR_DETAIL_ARCH, &arch,
1.32 + RAZOR_DETAIL_LAST))
1.33 list_package_properties(set, package, type);
1.34 razor_package_iterator_destroy(pi);
1.35 razor_set_destroy(set);
1.36 @@ -253,7 +259,10 @@
1.37
1.38 pi = create_iterator_from_argv(set, argc, argv);
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,
1.44 + RAZOR_DETAIL_LAST))
1.45 razor_set_list_package_files(set, package);
1.46 razor_package_iterator_destroy(pi);
1.47
1.48 @@ -445,7 +454,8 @@
1.49
1.50 pi = razor_package_iterator_create(set);
1.51 while (razor_package_iterator_next(pi, &package,
1.52 - RAZOR_DETAIL_NAME, &name, NULL)) {
1.53 + RAZOR_DETAIL_NAME, &name,
1.54 + RAZOR_DETAIL_LAST)) {
1.55 if (pattern && fnmatch(pattern, name, 0) == 0) {
1.56 razor_transaction_update_package(trans, package);
1.57 matches++;
1.58 @@ -466,7 +476,9 @@
1.59 int matches = 0;
1.60
1.61 pi = razor_package_iterator_create(set);
1.62 - while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, NULL)) {
1.63 + while (razor_package_iterator_next(pi, &package,
1.64 + RAZOR_DETAIL_NAME, &name,
1.65 + RAZOR_DETAIL_LAST)) {
1.66 if (pattern && fnmatch(pattern, name, 0) == 0) {
1.67 razor_transaction_remove_package(trans, package);
1.68 matches++;
1.69 @@ -676,7 +688,8 @@
1.70 while (razor_package_iterator_next(pi, &package,
1.71 RAZOR_DETAIL_NAME, &name,
1.72 RAZOR_DETAIL_VERSION, &version,
1.73 - RAZOR_DETAIL_ARCH, &arch, NULL)) {
1.74 + RAZOR_DETAIL_ARCH, &arch,
1.75 + RAZOR_DETAIL_LAST)) {
1.76 snprintf(url, sizeof url,
1.77 "%s/Packages/%s",
1.78 yum_url, rpm_filename(name, version, arch));
1.79 @@ -708,7 +721,8 @@
1.80 while (razor_package_iterator_next(pi, &package,
1.81 RAZOR_DETAIL_NAME, &name,
1.82 RAZOR_DETAIL_VERSION, &version,
1.83 - RAZOR_DETAIL_ARCH, &arch, NULL)) {
1.84 + RAZOR_DETAIL_ARCH, &arch,
1.85 + RAZOR_DETAIL_LAST)) {
1.86 printf("install %s-%s\n", name, version);
1.87
1.88 snprintf(file, sizeof file,
1.89 @@ -816,7 +830,8 @@
1.90 while (razor_package_iterator_next(pi, &package,
1.91 RAZOR_DETAIL_NAME, &name,
1.92 RAZOR_DETAIL_VERSION, &version,
1.93 - RAZOR_DETAIL_ARCH, &arch, NULL)) {
1.94 + RAZOR_DETAIL_ARCH, &arch,
1.95 + RAZOR_DETAIL_LAST)) {
1.96 if (pattern && fnmatch(pattern, name, 0) != 0)
1.97 continue;
1.98
1.99 @@ -859,7 +874,8 @@
1.100 while (razor_package_iterator_next(pi, &package,
1.101 RAZOR_DETAIL_NAME, &name,
1.102 RAZOR_DETAIL_VERSION, &version,
1.103 - RAZOR_DETAIL_ARCH, &arch, NULL)) {
1.104 + RAZOR_DETAIL_ARCH, &arch,
1.105 + RAZOR_DETAIL_LAST)) {
1.106 if (pattern && fnmatch(pattern, name, 0) != 0)
1.107 continue;
1.108
1.109 @@ -868,7 +884,7 @@
1.110 RAZOR_DETAIL_DESCRIPTION, &description,
1.111 RAZOR_DETAIL_URL, &url,
1.112 RAZOR_DETAIL_LICENSE, &license,
1.113 - NULL);
1.114 + RAZOR_DETAIL_LAST);
1.115
1.116 printf ("Name: %s\n", name);
1.117 printf ("Arch: %s\n", arch);
1.118 @@ -920,7 +936,7 @@
1.119 RAZOR_DETAIL_DESCRIPTION, &description,
1.120 RAZOR_DETAIL_URL, &url,
1.121 RAZOR_DETAIL_LICENSE, &license,
1.122 - NULL)) {
1.123 + RAZOR_DETAIL_LAST)) {
1.124 if (!fnmatch(pattern, name, FNM_CASEFOLD) ||
1.125 !fnmatch(pattern, url, FNM_CASEFOLD) ||
1.126 !fnmatch(pattern, summary, FNM_CASEFOLD) ||