Rename APK_ADD_INDEX to APK_ADD_INSTALLED_DB while we can

diff --git a/ext/repo_apk.c b/ext/repo_apk.c
index 223490a221f28ab0fee8a5ef77bf06b07f7a18a4..7d80bfcef873d1096803963d15873146963fb6a1 100644 (file)
--- a/ext/repo_apk.c
+++ b/ext/repo_apk.c
@@ -325,7 +325,7 @@ add_apkv3_idx(Repo *repo, Repodata *data, FILE *fp, int flags, int adbchar)
 {
   FILE *cfp;
   int r;
-  if (!(cfp = open_apkv3(repo->pool, -1, fp, (flags & APK_ADD_INDEX ? "installed db" : "package index"), adbchar)))
+  if (!(cfp = open_apkv3(repo->pool, -1, fp, (flags & APK_ADD_INSTALLED_DB ? "installed database" : "package index"), adbchar)))
     return -1;
   r = apkv3_add_idx(repo, data, cfp, flags);
   fclose(cfp);
@@ -699,7 +699,7 @@ repo_add_apk_repo(Repo *repo, FILE *fp, int flags)
   /* peek into first byte to find out if this is a compressed file */
   c = fgetc(fp);
   if (c == EOF)
-    return (flags & APK_ADD_INDEX) != 0 ? 0 : -1;      /* an empty file is allowed for the v2 index */
+    return (flags & APK_ADD_INSTALLED_DB) != 0 ? 0 : -1;       /* an empty file is allowed for the v2 db */
   ungetc(c, fp);
 
   if (c == 'A')
@@ -708,7 +708,7 @@ repo_add_apk_repo(Repo *repo, FILE *fp, int flags)
        return -1;
      if (first[0] == 'A' && first[1] == 'D' && first[2] == 'B')
        return add_apkv3_idx(repo, data, fp, flags, first[3]);
-     if ((flags & APK_ADD_INDEX) == 0)
+     if ((flags & APK_ADD_INSTALLED_DB) == 0)
       return -1;       /* not a tar file */
     }
 
@@ -737,7 +737,7 @@ repo_add_apk_repo(Repo *repo, FILE *fp, int flags)
       th.end = 4;
     }
   
-  if ((flags & APK_ADD_INDEX) != 0)
+  if ((flags & APK_ADD_INSTALLED_DB) != 0)
     apk_process_index(repo, data, &th, flags);
   else
     {

diff --git a/ext/repo_apk.h b/ext/repo_apk.h
index 8b3a7af3598e7a5ac6ab8b266216f856c170e234..dfb564f4f1c6ee8aafd78762d782c462cd3b9059 100644 (file)
--- a/ext/repo_apk.h
+++ b/ext/repo_apk.h
@@ -5,7 +5,7 @@
  * for further information
  */
 
-#define APK_ADD_INDEX                  (1 << 8)
+#define APK_ADD_INSTALLED_DB           (1 << 8)
 #define APK_ADD_WITH_PKGID             (1 << 9)
 #define APK_ADD_WITH_HDRID             (1 << 10)
 

diff --git a/ext/repo_apkv3.c b/ext/repo_apkv3.c
index 678b9130cd6eb88c8084cb6e213f128ad41a047f..d828bf6bcaac38428ac7ae9ff11fd05d053aef24 100644 (file)
--- a/ext/repo_apkv3.c
+++ b/ext/repo_apkv3.c
@@ -389,11 +389,11 @@ apkv3_add_idx(Repo *repo, Repodata *data, FILE *fp, int flags)
   const unsigned char *adb;
   size_t adblen;
   unsigned int v, cnt, idx;
-  int idb = flags & APK_ADD_INDEX ? 1 : 0;
+  int idb = flags & APK_ADD_INSTALLED_DB ? 1 : 0;
 
   if (fread(buf, 4, 1, fp) != 1 || memcmp(buf, (idb ? "idb" : "indx") , 4))
     {
-      pool_error(pool, -1, (idb ?  "not an apkv3 installed database" : "not an apkv3 index"));
+      pool_error(pool, -1, (idb ?  "not an apkv3 installed database" : "not an apkv3 package index"));
       return -1;
     }
 

diff --git a/tools/apk2solv.c b/tools/apk2solv.c
index 93c7a1350e2c381f5499b76255fc16e94ff776ae..ec8db41bac9bf4f877daf7c70adc7bc00a538c51 100644 (file)
--- a/tools/apk2solv.c
+++ b/tools/apk2solv.c
@@ -129,7 +129,7 @@ main(int argc, char **argv)
   if (isrepo)
     {
       if (islocaldb)
-       flags |= APK_ADD_INDEX;
+       flags |= APK_ADD_INSTALLED_DB;
       if (!npkgs)
        {
          if (repo_add_apk_repo(repo, stdin, REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE|flags) != 0)