summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.c42
-rw-r--r--src/rpm.c32
2 files changed, 44 insertions, 30 deletions
diff --git a/src/main.c b/src/main.c
index 4e15164..56b3b2c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,7 +47,7 @@ create_iterator_from_argv(struct razor_set *set, int argc, const char *argv[])
struct razor_package_query *query;
struct razor_package_iterator *iter;
struct razor_package *package;
- const char *name, *version, *arch, *pattern;
+ const char *name, *pattern;
int i, count;
if (argc == 0)
@@ -59,8 +59,7 @@ create_iterator_from_argv(struct razor_set *set, int argc, const char *argv[])
iter = razor_package_iterator_create(set);
pattern = argv[i];
count = 0;
- while (razor_package_iterator_next(iter, &package,
- &name, &version, &arch)) {
+ while (razor_package_iterator_next(iter, &package, RAZOR_DETAIL_NAME, &name, 0)) {
if (fnmatch(pattern, name, 0) != 0)
continue;
@@ -86,7 +85,9 @@ list_packages(struct razor_package_iterator *iter, uint32_t flags)
const char *name, *version, *arch;
while (razor_package_iterator_next(iter, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_VERSION, &version,
+ RAZOR_DETAIL_ARCH, &arch, 0)) {
if (flags & LIST_PACKAGES_ONLY_NAMES)
printf("%s\n", name);
else
@@ -425,12 +426,12 @@ mark_packages_for_update(struct razor_transaction *trans,
{
struct razor_package_iterator *pi;
struct razor_package *package;
- const char *name, *version, *arch;
+ const char *name;
int matches = 0;
pi = razor_package_iterator_create(set);
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name, 0)) {
if (pattern && fnmatch(pattern, name, 0) == 0) {
razor_transaction_update_package(trans, package);
matches++;
@@ -447,12 +448,11 @@ mark_packages_for_removal(struct razor_transaction *trans,
{
struct razor_package_iterator *pi;
struct razor_package *package;
- const char *name, *version, *arch;
+ const char *name;
int matches = 0;
pi = razor_package_iterator_create(set);
- while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ while (razor_package_iterator_next(pi, &package, RAZOR_DETAIL_NAME, &name, 0)) {
if (pattern && fnmatch(pattern, name, 0) == 0) {
razor_transaction_remove_package(trans, package);
matches++;
@@ -660,7 +660,9 @@ download_packages(struct razor_set *system, struct razor_set *next)
pi = razor_set_create_install_iterator(system, next);
errors = 0;
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_VERSION, &version,
+ RAZOR_DETAIL_ARCH, &arch, 0)) {
snprintf(url, sizeof url,
"%s/Packages/%s",
yum_url, rpm_filename(name, version, arch));
@@ -690,7 +692,9 @@ install_packages(struct razor_set *system, struct razor_set *next)
pi = razor_set_create_install_iterator(system, next);
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_VERSION, &version,
+ RAZOR_DETAIL_ARCH, &arch, 0)) {
printf("install %s-%s\n", name, version);
snprintf(file, sizeof file,
@@ -796,7 +800,9 @@ command_download(int argc, const char *argv[])
set = razor_set_open(rawhide_repo_filename);
pi = razor_package_iterator_create(set);
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_VERSION, &version,
+ RAZOR_DETAIL_ARCH, &arch, 0)) {
if (pattern && fnmatch(pattern, name, 0) != 0)
continue;
@@ -837,12 +843,18 @@ command_info(int argc, const char *argv[])
return 1;
pi = razor_package_iterator_create(set);
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_VERSION, &version,
+ RAZOR_DETAIL_ARCH, &arch, 0)) {
if (pattern && fnmatch(pattern, name, 0) != 0)
continue;
- razor_package_get_details (set, package, &summary, &description,
- &url, &license);
+ razor_package_get_details (set, package,
+ RAZOR_DETAIL_SUMMARY, &summary,
+ RAZOR_DETAIL_DESCRIPTION, &description,
+ RAZOR_DETAIL_URL, &url,
+ RAZOR_DETAIL_LICENSE, &license,
+ 0);
printf ("Name: %s\n", name);
printf ("Arch: %s\n", arch);
diff --git a/src/rpm.c b/src/rpm.c
index 872f926..76f2414 100644
--- a/src/rpm.c
+++ b/src/rpm.c
@@ -303,7 +303,7 @@ add_command_line_packages(struct razor_set *set,
{
struct razor_package *package;
struct razor_package_iterator *pi;
- const char *name, *version, *arch;
+ const char *name;
int i, cmp, errors;
qsort(argv, argc, sizeof(*argv), strcmpp);
@@ -313,7 +313,7 @@ add_command_line_packages(struct razor_set *set,
pi = razor_package_iterator_create(set);
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name, 0)) {
while (cmp = strcmp(argv[i], name), cmp < 0 && i < argc) {
fprintf(stderr, "error: package %s is not installed\n",
argv[i]);
@@ -417,8 +417,12 @@ print_package_info(struct razor_set *set, struct razor_package *package,
{
const char *summary, *description, *url, *license;
- razor_package_get_details(set, package, &summary, &description,
- &url, &license);
+ razor_package_get_details (set, package,
+ RAZOR_DETAIL_SUMMARY, &summary,
+ RAZOR_DETAIL_DESCRIPTION, &description,
+ RAZOR_DETAIL_URL, &url,
+ RAZOR_DETAIL_LICENSE, &license,
+ 0);
printf("Name: %s\n", name);
printf("Arch: %s\n", arch);
@@ -488,7 +492,9 @@ command_query(int argc, const char *argv[])
pi = get_query_packages(set, argc, argv);
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_VERSION, &version,
+ RAZOR_DETAIL_ARCH, &arch, 0)) {
if (option_conflicts)
print_package_properties(set, package,
RAZOR_PROPERTY_CONFLICTS);
@@ -540,7 +546,9 @@ command_verify(int argc, const char *argv[])
pi = get_query_packages(set, argc, argv);
while (razor_package_iterator_next(pi, &package,
- &name, &version, &arch)) {
+ RAZOR_DETAIL_NAME, &name,
+ RAZOR_DETAIL_VERSION, &version,
+ RAZOR_DETAIL_ARCH, &arch, 0)) {
printf("verify %s-%s.%s - not implemented\n",
name, version, arch);
}
@@ -570,7 +578,6 @@ command_erase(int argc, const char *argv[])
struct razor_package_query *query;
struct razor_package_iterator *pi;
struct razor_package *package;
- const char *name, *version, *arch;
if (argc == 0) {
printf("no packages given for erase\n");
@@ -586,8 +593,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,
- &name, &version, &arch))
+ while (razor_package_iterator_next(pi, &package, 0))
razor_transaction_remove_package(trans, package);
razor_package_iterator_destroy(pi);
@@ -617,7 +623,6 @@ command_install(int argc, const char *argv[])
struct razor_transaction *trans;
struct razor_package_iterator *pi;
struct razor_package *package;
- const char *name, *version, *arch;
if (argc == 0) {
printf("no packages given for install\n");
@@ -630,8 +635,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,
- &name, &version, &arch))
+ while (razor_package_iterator_next(pi, &package, 0))
razor_transaction_install_package(trans, package);
razor_package_iterator_destroy(pi);
@@ -661,7 +665,6 @@ command_update(int argc, const char *argv[])
struct razor_transaction *trans;
struct razor_package_iterator *pi;
struct razor_package *package;
- const char *name, *version, *arch;
if (argc == 0) {
printf("no packages given for update\n");
@@ -674,8 +677,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,
- &name, &version, &arch))
+ while (razor_package_iterator_next(pi, &package, 0))
razor_transaction_update_package(trans, package);
razor_package_iterator_destroy(pi);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 07:08:41 +0000