From a3adbcda95efff1401165c8f5c58cff34c91e55d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 13 Jun 2012 09:23:48 +0200
Subject: [PATCH] libxbps: use prop_array_get_cstring_nocopy().

---
 lib/repository_finddeps.c  | 7 +------
 lib/transaction_sortdeps.c | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/repository_finddeps.c b/lib/repository_finddeps.c
index 492c40b6..a64eebb7 100644
--- a/lib/repository_finddeps.c
+++ b/lib/repository_finddeps.c
@@ -170,7 +170,6 @@ find_repo_deps(prop_dictionary_t transd, 	/* transaction dictionary */
 	struct xbps_handle *xhp = xbps_handle_get();
 	prop_dictionary_t curpkgd, tmpd;
 	prop_array_t curpkgrdeps, unsorted;
-	prop_object_t obj;
 	pkg_state_t state;
 	size_t i, x;
 	const char *reqpkg, *pkgver_q, *reason = NULL;
@@ -185,11 +184,7 @@ find_repo_deps(prop_dictionary_t transd, 	/* transaction dictionary */
 	 * current package.
 	 */
 	for (i = 0; i < prop_array_count(pkg_rdeps_array); i++) {
-		obj = prop_array_get(pkg_rdeps_array, i);
-		if ((reqpkg = prop_string_cstring_nocopy(obj)) == NULL) {
-			rv = EINVAL;
-			break;
-		}
+		prop_array_get_cstring_nocopy(pkg_rdeps_array, i, &reqpkg);
 		if (xhp->flags & XBPS_FLAG_DEBUG) {
 			xbps_dbg_printf("");
 			for (x = 0; x < *depth; x++)
diff --git a/lib/transaction_sortdeps.c b/lib/transaction_sortdeps.c
index 6bfc547e..8332bd51 100644
--- a/lib/transaction_sortdeps.c
+++ b/lib/transaction_sortdeps.c
@@ -189,7 +189,6 @@ sort_pkg_rundeps(prop_dictionary_t transd,
 		 prop_array_t pkg_rundeps)
 {
 	prop_dictionary_t curpkgd;
-	prop_object_t obj;
 	struct pkgdep *lpd, *pdn;
 	const char *str, *tract;
 	char *pkgnamedep;
@@ -202,12 +201,7 @@ sort_pkg_rundeps(prop_dictionary_t transd,
 
 again:
 	for (i = idx; i < prop_array_count(pkg_rundeps); i++) {
-		obj = prop_array_get(pkg_rundeps, i);
-		str = prop_string_cstring_nocopy(obj);
-		if (str == NULL) {
-			rv = ENOMEM;
-			break;
-		}
+		prop_array_get_cstring_nocopy(pkg_rundeps, i, &str);
 		pkgnamedep = xbps_pkgpattern_name(str);
 		if (pkgnamedep == NULL) {
 			rv = ENOMEM;