summaryrefslogtreecommitdiffstats
path: root/libopkg/pkg.c
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-23 21:34:55 (EST)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-23 21:34:55 (EST)
commit28ad6d9ffcc6cd3c3683abac2f186c7ce52cab00 (patch)
tree598e833c78342488e3eb8a19c038a845a1e91bfa /libopkg/pkg.c
parentf4296235e3e302b8729de3fdf92fdd742374c68b (diff)
Fix pkg_depend_str() to not use pkg->depends_str.
git-svn-id: http://opkg.googlecode.com/svn/trunk@353 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/pkg.c')
-rw-r--r--libopkg/pkg.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/libopkg/pkg.c b/libopkg/pkg.c
index 89f47a9..e37806b 100644
--- a/libopkg/pkg.c
+++ b/libopkg/pkg.c
@@ -530,27 +530,6 @@ void set_flags_from_control(opkg_conf_t *conf, pkg_t *pkg){
return;
}
-const char*
-constraint_to_str(enum version_constraint c)
-{
- switch (c) {
- case NONE:
- return "";
- case EARLIER:
- return "< ";
- case EARLIER_EQUAL:
- return "<= ";
- case EQUAL:
- return "= ";
- case LATER_EQUAL:
- return ">= ";
- case LATER:
- return "> ";
- }
-
- return "";
-}
-
void pkg_formatted_field(FILE *fp, pkg_t *pkg, const char *field)
{
int i;
@@ -616,7 +595,9 @@ void pkg_formatted_field(FILE *fp, pkg_t *pkg, const char *field)
if (pkg->depends_count) {
fprintf(fp, "Depends:");
for(i = 0; i < pkg->depends_count; i++) {
- fprintf(fp, "%s %s", i == 0 ? "" : ",", pkg->depends_str[i]);
+ char *str = pkg_depend_str(pkg, i);
+ fprintf(fp, "%s %s", i == 0 ? "" : ",", str);
+ free(str);
}
fprintf(fp, "\n");
}