Move a couple of unrelated functions out of transaction.c.
authorKristian H?gsberg <krh@redhat.com>
Mon Jun 23 17:21:03 2008 -0400 (2008-06-23)
changeset 270d4a5fba50fd7
parent 269 03fc85294bc9
child 271 3980d1d9148e
Move a couple of unrelated functions out of transaction.c.
librazor/razor.c
librazor/transaction.c
     1.1 --- a/librazor/razor.c	Mon Jun 23 17:19:20 2008 -0400
     1.2 +++ b/librazor/razor.c	Mon Jun 23 17:21:03 2008 -0400
     1.3 @@ -397,6 +397,47 @@
     1.4  	*license = &pool[package->license];
     1.5  }
     1.6  
     1.7 +RAZOR_EXPORT const char *
     1.8 +razor_property_relation_to_string(struct razor_property *p)
     1.9 +{
    1.10 +	switch (p->flags & RAZOR_PROPERTY_RELATION_MASK) {
    1.11 +	case RAZOR_PROPERTY_LESS:
    1.12 +		return "<";
    1.13 +
    1.14 +	case RAZOR_PROPERTY_LESS | RAZOR_PROPERTY_EQUAL:
    1.15 +		return "<=";
    1.16 +
    1.17 +	case RAZOR_PROPERTY_EQUAL:
    1.18 +		return "=";
    1.19 +
    1.20 +	case RAZOR_PROPERTY_GREATER | RAZOR_PROPERTY_EQUAL:
    1.21 +		return ">=";
    1.22 +
    1.23 +	case RAZOR_PROPERTY_GREATER:
    1.24 +		return ">";
    1.25 +
    1.26 +	default:
    1.27 +		return "?";
    1.28 +	}
    1.29 +}
    1.30 +
    1.31 +RAZOR_EXPORT const char *
    1.32 +razor_property_type_to_string(struct razor_property *p)
    1.33 +{
    1.34 +	switch (p->flags & RAZOR_PROPERTY_TYPE_MASK) {
    1.35 +	case RAZOR_PROPERTY_REQUIRES:
    1.36 +		return "requires";
    1.37 +	case RAZOR_PROPERTY_PROVIDES:
    1.38 +		return "provides";
    1.39 +	case RAZOR_PROPERTY_CONFLICTS:
    1.40 +		return "conflicts";
    1.41 +	case RAZOR_PROPERTY_OBSOLETES:
    1.42 +		return "obsoletes";
    1.43 +	default:
    1.44 +		return NULL;
    1.45 +	}
    1.46 +}
    1.47 +
    1.48  RAZOR_EXPORT struct razor_entry *
    1.49  razor_set_find_entry(struct razor_set *set,
    1.50  		     struct razor_entry *dir, const char *pattern)
     2.1 --- a/librazor/transaction.c	Mon Jun 23 17:19:20 2008 -0400
     2.2 +++ b/librazor/transaction.c	Mon Jun 23 17:21:03 2008 -0400
     2.3 @@ -461,47 +461,6 @@
     2.4  	}
     2.5  }
     2.6  
     2.7 -RAZOR_EXPORT const char *
     2.8 -razor_property_relation_to_string(struct razor_property *p)
     2.9 -{
    2.10 -	switch (p->flags & RAZOR_PROPERTY_RELATION_MASK) {
    2.11 -	case RAZOR_PROPERTY_LESS:
    2.12 -		return "<";
    2.13 -
    2.14 -	case RAZOR_PROPERTY_LESS | RAZOR_PROPERTY_EQUAL:
    2.15 -		return "<=";
    2.16 -
    2.17 -	case RAZOR_PROPERTY_EQUAL:
    2.18 -		return "=";
    2.19 -
    2.20 -	case RAZOR_PROPERTY_GREATER | RAZOR_PROPERTY_EQUAL:
    2.21 -		return ">=";
    2.22 -
    2.23 -	case RAZOR_PROPERTY_GREATER:
    2.24 -		return ">";
    2.25 -
    2.26 -	default:
    2.27 -		return "?";
    2.28 -	}
    2.29 -}
    2.30 -
    2.31 -RAZOR_EXPORT const char *
    2.32 -razor_property_type_to_string(struct razor_property *p)
    2.33 -{
    2.34 -	switch (p->flags & RAZOR_PROPERTY_TYPE_MASK) {
    2.35 -	case RAZOR_PROPERTY_REQUIRES:
    2.36 -		return "requires";
    2.37 -	case RAZOR_PROPERTY_PROVIDES:
    2.38 -		return "provides";
    2.39 -	case RAZOR_PROPERTY_CONFLICTS:
    2.40 -		return "conflicts";
    2.41 -	case RAZOR_PROPERTY_OBSOLETES:
    2.42 -		return "obsoletes";
    2.43 -	default:
    2.44 -		return NULL;
    2.45 -	}
    2.46 -}
    2.47 -
    2.48  static void
    2.49  mark_satisfied_requires(struct razor_transaction *trans,
    2.50  			struct transaction_set *rts,