From de4504c2487f4bc034715cd9ab39c03ee5b04d95 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 10 Nov 2011 09:21:17 +0100
Subject: [PATCH] Update refs to pkg-index, which aren't true anymore.

---
 bin/xbps-bin/trans_cb.c     |  4 ++--
 bin/xbps-repo/index.c       |  4 ++--
 include/xbps_api.h          |  2 +-
 lib/repository_pool.c       |  2 +-
 lib/repository_sync_index.c | 13 ++++++-------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/bin/xbps-bin/trans_cb.c b/bin/xbps-bin/trans_cb.c
index a22bbb03..e0f93614 100644
--- a/bin/xbps-bin/trans_cb.c
+++ b/bin/xbps-bin/trans_cb.c
@@ -78,7 +78,7 @@ transaction_cb(struct xbps_transaction_cb_data *xtcd)
 		    xtcd->pkgver, xtcd->binpkg_fname);
 		break;
 	case XBPS_TRANS_STATE_REPOSYNC:
-		printf("Synchronizing pkg-index for `%s' ...\n",
+		printf("Synchronizing index for `%s' ...\n",
 		    xtcd->repourl);
 		break;
 	default:
@@ -120,7 +120,7 @@ transaction_err_cb(struct xbps_transaction_cb_data *xtcd)
 		state_descr = "failed to register package";
 		break;
 	case XBPS_TRANS_STATE_REPOSYNC:
-		xbps_error_printf("Failed to sync pkg-index: %s\n",
+		xbps_error_printf("Failed to sync index: %s\n",
 		    res ? res : strerror(xtcd->err));
 		return;
 	default:
diff --git a/bin/xbps-repo/index.c b/bin/xbps-repo/index.c
index 871ce98d..0443f90a 100644
--- a/bin/xbps-repo/index.c
+++ b/bin/xbps-repo/index.c
@@ -37,7 +37,7 @@
 #include "defs.h"
 
 /*
- * Removes stalled pkg entries in repository's pkg-index.plist file, if any
+ * Removes stalled pkg entries in repository's index.plist file, if any
  * binary package cannot be read (unavailable, not enough perms, etc).
  */
 static int
@@ -113,7 +113,7 @@ repoidx_getdict(const char *pkgdir)
 	int rv;
 
 	/*
-	 * Remove entries in repositories pkg-index for unexistent
+	 * Remove entries in repositories index for unexistent
 	 * packages, i.e dangling entries.
 	 */
 	if ((rv = remove_missing_binpkg_entries(pkgdir)) != 0)
diff --git a/include/xbps_api.h b/include/xbps_api.h
index 6141e52d..874370f8 100644
--- a/include/xbps_api.h
+++ b/include/xbps_api.h
@@ -1237,7 +1237,7 @@ struct repository_pool_index {
 	/**
 	 * @var rpi_repod
 	 * 
-	 * Internalized Proplib dictionary of the pkg-index plist file
+	 * Internalized Proplib dictionary of the index plist file
 	 * associated with repository.
 	 */
 	prop_dictionary_t rpi_repod;
diff --git a/lib/repository_pool.c b/lib/repository_pool.c
index 10e63cfd..eb62e364 100644
--- a/lib/repository_pool.c
+++ b/lib/repository_pool.c
@@ -191,7 +191,7 @@ xbps_repository_pool_init(void)
 			free(plist);
 			if (errno == ENOENT) {
 				errno = 0;
-				xbps_dbg_printf("[rpool] missing pkg-index.plist "
+				xbps_dbg_printf("[rpool] missing index file "
 				    "for '%s' repository.\n", repouri);
 				nmissing++;
 				continue;
diff --git a/lib/repository_sync_index.c b/lib/repository_sync_index.c
index d6dcd36c..cab4fc84 100644
--- a/lib/repository_sync_index.c
+++ b/lib/repository_sync_index.c
@@ -129,7 +129,7 @@ xbps_repository_sync_pkg_index(const char *uri)
 		goto out;
 	}
 	/*
-	 * Remote repository pkg-index.plist full URL.
+	 * Remote repository index.plist full URL.
 	 */
 	rpidx = xbps_xasprintf("%s/%s", uri, XBPS_PKGINDEX);
 	if (rpidx == NULL) {
@@ -146,8 +146,7 @@ xbps_repository_sync_pkg_index(const char *uri)
 		goto out;
 	}
 	/*
-	 * Full path to repository directory to store the pkg-index.plist
-	 * file.
+	 * Full path to repository directory to store the index.plist file.
 	 */
 	lrepodir = xbps_xasprintf("%s/%s/%s",
 	    prop_string_cstring_nocopy(xhp->rootdir), XBPS_META_PATH, uri_fixedp);
@@ -156,7 +155,7 @@ xbps_repository_sync_pkg_index(const char *uri)
 		goto out;
 	}
 	/*
-	 * If directory exists probably the pkg-index.plist file
+	 * If directory exists probably the index.plist file
 	 * was downloaded previously...
 	 */
 	rv = stat(lrepodir, &st);
@@ -172,7 +171,7 @@ xbps_repository_sync_pkg_index(const char *uri)
 		xhp->xbps_transaction_cb(xhp->xtcd);
 	}
 	/*
-	 * Download pkg-index.plist file from repository.
+	 * Download index.plist file from repository.
 	 */
 	if (xbps_fetch_file(rpidx, fetch_outputdir, true, NULL) == -1) {
 		if (xhp->xbps_transaction_err_cb) {
@@ -193,7 +192,7 @@ xbps_repository_sync_pkg_index(const char *uri)
 	 */
 	tmpd = prop_dictionary_internalize_from_zfile(tmp_metafile);
 	if (tmpd == NULL) {
-		xbps_error_printf("[rsyncidx] downloaded pkg-index.plist "
+		xbps_error_printf("[rsyncidx] downloaded index.plist "
 		    "file cannot be read! removing...\n");
 		(void)unlink(tmp_metafile);
 		rv = -1;
@@ -207,7 +206,7 @@ xbps_repository_sync_pkg_index(const char *uri)
 		goto out;
 	}
 	/*
-	 * Create local repodir to store pkg-index.plist file.
+	 * Create local repodir to store index.plist file.
 	 */
 	if ((rv = xbps_mkpath(lrepodir, 0755)) == -1) {
 		xbps_dbg_printf("[rsyncidx] failed to create repodir "