summaryrefslogtreecommitdiff
path: root/src/rpm.c
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2008-07-01 09:22:25 +0100
committerRichard Hughes <richard@hughsie.com>2008-07-01 09:22:25 +0100
commita6a8f407fb539a884a132f3289919aeb4a8d78df (patch)
treea6accbfdef755d24f248e73231fdc67ee9cb4393 /src/rpm.c
parent27e3b5098d6c01d978cb5d530ea98f5f4069b25d (diff)
convert the NULL sentinel to RAZOR_DETAIL_LAST
Diffstat (limited to 'src/rpm.c')
-rw-r--r--src/rpm.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/rpm.c b/src/rpm.c
index bd31434..add25c8 100644
--- a/src/rpm.c
+++ b/src/rpm.c
@@ -313,7 +313,8 @@ add_command_line_packages(struct razor_set *set,
pi = razor_package_iterator_create(set);
while (razor_package_iterator_next(pi, &package,
- RAZOR_DETAIL_NAME, &name, NULL)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_LAST)) {
while (cmp = strcmp(argv[i], name), cmp < 0 && i < argc) {
fprintf(stderr, "error: package %s is not installed\n",
argv[i]);
@@ -422,7 +423,7 @@ print_package_info(struct razor_set *set, struct razor_package *package,
RAZOR_DETAIL_DESCRIPTION, &description,
RAZOR_DETAIL_URL, &url,
RAZOR_DETAIL_LICENSE, &license,
- NULL);
+ RAZOR_DETAIL_LAST);
printf("Name: %s\n", name);
printf("Arch: %s\n", arch);
@@ -494,7 +495,8 @@ command_query(int argc, const char *argv[])
while (razor_package_iterator_next(pi, &package,
RAZOR_DETAIL_NAME, &name,
RAZOR_DETAIL_VERSION, &version,
- RAZOR_DETAIL_ARCH, &arch, NULL)) {
+ RAZOR_DETAIL_ARCH, &arch,
+ RAZOR_DETAIL_LAST)) {
if (option_conflicts)
print_package_properties(set, package,
RAZOR_PROPERTY_CONFLICTS);
@@ -548,7 +550,8 @@ command_verify(int argc, const char *argv[])
while (razor_package_iterator_next(pi, &package,
RAZOR_DETAIL_NAME, &name,
RAZOR_DETAIL_VERSION, &version,
- RAZOR_DETAIL_ARCH, &arch, NULL)) {
+ RAZOR_DETAIL_ARCH, &arch,
+ RAZOR_DETAIL_LAST)) {
printf("verify %s-%s.%s - not implemented\n",
name, version, arch);
}
@@ -593,7 +596,7 @@ command_erase(int argc, const char *argv[])
add_command_line_packages(set, query, argc, argv);
pi = razor_package_query_finish(query);
- while (razor_package_iterator_next(pi, &package, NULL))
+ while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_LAST))
razor_transaction_remove_package(trans, package);
razor_package_iterator_destroy(pi);
@@ -635,7 +638,7 @@ command_install(int argc, const char *argv[])
trans = razor_transaction_create(set, upstream);
pi = razor_package_iterator_create(upstream);
- while (razor_package_iterator_next(pi, &package, NULL))
+ while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_LAST))
razor_transaction_install_package(trans, package);
razor_package_iterator_destroy(pi);
@@ -677,7 +680,7 @@ command_update(int argc, const char *argv[])
trans = razor_transaction_create(set, upstream);
pi = razor_package_iterator_create(upstream);
- while (razor_package_iterator_next(pi, &package, NULL))
+ while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_LAST))
razor_transaction_update_package(trans, package);
razor_package_iterator_destroy(pi);