From 99be91a0fdb86a6826a0cdcf8bede14b7d01c9a8 Mon Sep 17 00:00:00 2001
From: graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Thu, 12 Nov 2009 01:26:26 -0500
Subject: Cleanup the rest of pkg_parse.c. Give some functions more appropriate names too.

git-svn-id: http://opkg.googlecode.com/svn/trunk@289 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
---
(limited to 'libopkg/pkg_depends.c')

diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
index e059a25..d93ea0c 100644
--- a/libopkg/pkg_depends.c
+++ b/libopkg/pkg_depends.c
@@ -356,7 +356,7 @@ int version_constraints_satisfied(depend_t * depends, pkg_t * pkg)
 
     temp = pkg_new();
 
-    parseVersion(temp, depends->version);
+    parse_version(temp, depends->version);
 
     comparison = pkg_compare_versions(pkg, temp);
 
@@ -770,7 +770,7 @@ static int parseDepends(compound_depend_t *compound_depend,
 		(*src != '|'))
 	       *dest++ = *src++;
 	  *dest = '\0';
-	  pkg_name = trim_alloc(buffer);
+	  pkg_name = trim_xstrdup(buffer);
           if (pkg_name == NULL )
 	       return -ENOMEM;
 	
@@ -822,7 +822,7 @@ static int parseDepends(compound_depend_t *compound_depend,
 		    *dest++ = *src++;
 	       *dest = '\0';
 	    
-	       possibilities[i]->version = trim_alloc(buffer);
+	       possibilities[i]->version = trim_xstrdup(buffer);
 	       /*	   	    fprintf(stderr, "let's print the depends version string:");
 				    fprintf(stderr, "version %s\n", possibilities[i]->version);*/
                if (possibilities[i]->version == NULL )
--
cgit v0.9.1