# HG changeset patch # User Kristian H?gsberg # Date 1214256063 14400 # Node ID d4a5fba50fd7388c8f723cc0cd624af51e8d7fb1 # Parent 03fc85294bc96086c9bfac84aed2c83c1d41a962 Move a couple of unrelated functions out of transaction.c. diff -r 03fc85294bc9 -r d4a5fba50fd7 librazor/razor.c --- a/librazor/razor.c Mon Jun 23 17:19:20 2008 -0400 +++ b/librazor/razor.c Mon Jun 23 17:21:03 2008 -0400 @@ -397,6 +397,47 @@ *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 -r 03fc85294bc9 -r d4a5fba50fd7 librazor/transaction.c --- a/librazor/transaction.c Mon Jun 23 17:19:20 2008 -0400 +++ b/librazor/transaction.c Mon Jun 23 17:21:03 2008 -0400 @@ -461,47 +461,6 @@ } } -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,