From: Kristian Høgsberg Date: Mon, 23 Jun 2008 21:21:03 +0000 (-0400) Subject: Move a couple of unrelated functions out of transaction.c. X-Git-Tag: 0.1~105 X-Git-Url: http://project.juiblex.co.uk/git/?a=commitdiff_plain;h=3c711911fba4ac0eea9fc74e0d9a181fb1e3c14b;p=razor.git Move a couple of unrelated functions out of transaction.c. --- diff --git a/librazor/razor.c b/librazor/razor.c index 76412f9..021480a 100644 --- a/librazor/razor.c +++ b/librazor/razor.c @@ -397,6 +397,47 @@ razor_package_get_details(struct razor_set *set, *license = &pool[package->license]; } +RAZOR_EXPORT const char * +razor_property_relation_to_string(struct razor_property *p) +{ + switch (p->flags & RAZOR_PROPERTY_RELATION_MASK) { + case RAZOR_PROPERTY_LESS: + return "<"; + + case RAZOR_PROPERTY_LESS | RAZOR_PROPERTY_EQUAL: + return "<="; + + case RAZOR_PROPERTY_EQUAL: + return "="; + + case RAZOR_PROPERTY_GREATER | RAZOR_PROPERTY_EQUAL: + return ">="; + + case RAZOR_PROPERTY_GREATER: + return ">"; + + default: + return "?"; + } +} + +RAZOR_EXPORT const char * +razor_property_type_to_string(struct razor_property *p) +{ + switch (p->flags & RAZOR_PROPERTY_TYPE_MASK) { + case RAZOR_PROPERTY_REQUIRES: + return "requires"; + case RAZOR_PROPERTY_PROVIDES: + return "provides"; + case RAZOR_PROPERTY_CONFLICTS: + return "conflicts"; + case RAZOR_PROPERTY_OBSOLETES: + return "obsoletes"; + default: + return NULL; + } +} + RAZOR_EXPORT struct razor_entry * razor_set_find_entry(struct razor_set *set, struct razor_entry *dir, const char *pattern) diff --git a/librazor/transaction.c b/librazor/transaction.c index 23515ad..3d8bf2f 100644 --- a/librazor/transaction.c +++ b/librazor/transaction.c @@ -461,47 +461,6 @@ clear_requires_flags(struct transaction_set *ts) } } -RAZOR_EXPORT const char * -razor_property_relation_to_string(struct razor_property *p) -{ - switch (p->flags & RAZOR_PROPERTY_RELATION_MASK) { - case RAZOR_PROPERTY_LESS: - return "<"; - - case RAZOR_PROPERTY_LESS | RAZOR_PROPERTY_EQUAL: - return "<="; - - case RAZOR_PROPERTY_EQUAL: - return "="; - - case RAZOR_PROPERTY_GREATER | RAZOR_PROPERTY_EQUAL: - return ">="; - - case RAZOR_PROPERTY_GREATER: - return ">"; - - default: - return "?"; - } -} - -RAZOR_EXPORT const char * -razor_property_type_to_string(struct razor_property *p) -{ - switch (p->flags & RAZOR_PROPERTY_TYPE_MASK) { - case RAZOR_PROPERTY_REQUIRES: - return "requires"; - case RAZOR_PROPERTY_PROVIDES: - return "provides"; - case RAZOR_PROPERTY_CONFLICTS: - return "conflicts"; - case RAZOR_PROPERTY_OBSOLETES: - return "obsoletes"; - default: - return NULL; - } -} - static void mark_satisfied_requires(struct razor_transaction *trans, struct transaction_set *rts,