Tags should use StoreString, not WriteStringInMap.

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 7152f04e2dce599f2efa7a423040a5391254877a..1b4c89f844aeebdc103e546f1adf0fa2bdf8754e 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1300,7 +1300,7 @@ bool pkgCacheGenerator::NewTag(pkgCache::VerIterator &Ver,
    
    // Fill it in
    pkgCache::TagIterator Tg(Cache,Cache.TagP + idxTag);
    
    // Fill it in
    pkgCache::TagIterator Tg(Cache,Cache.TagP + idxTag);

-   map_pointer_t const idxName = WriteStringInMap(NameStart,NameSize);
+   map_pointer_t const idxName = StoreString(TAG,NameStart,NameSize);

    if (idxName == 0)
       return false;
    Tg->Name = idxName;
    if (idxName == 0)
       return false;
    Tg->Name = idxName;


@@ -1379,6 +1379,7 @@ map_stringitem_t pkgCacheGenerator::StoreString(enum StringType const type, cons
       case PKGNAME: strings = &strPkgNames; break;
       case VERSIONNUMBER: strings = &strVersions; break;
       case SECTION: strings = &strSections; break;
       case PKGNAME: strings = &strPkgNames; break;
       case VERSIONNUMBER: strings = &strVersions; break;
       case SECTION: strings = &strSections; break;

+      case TAG: strings = &strTags; break;

       default: _error->Fatal("Unknown enum type used for string storage of '%.*s'", Size, S); return 0;
    }
 
       default: _error->Fatal("Unknown enum type used for string storage of '%.*s'", Size, S); return 0;
    }
 

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 541e143ba5f63f31c69bc6a9e58cc1a5e4b10c6a..27fd8d4d0186be65f74116ba9735c84c112d993d 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -78,6 +78,7 @@ class APT_HIDDEN pkgCacheGenerator                                    /*{{{*/
    std::unordered_set<string_pointer, hash> strPkgNames;
    std::unordered_set<string_pointer, hash> strVersions;
    std::unordered_set<string_pointer, hash> strSections;
    std::unordered_set<string_pointer, hash> strPkgNames;
    std::unordered_set<string_pointer, hash> strVersions;
    std::unordered_set<string_pointer, hash> strSections;

+   std::unordered_set<string_pointer, hash> strTags;

 #endif
 
    friend class pkgCacheListParser;
 #endif
 
    friend class pkgCacheListParser;


@@ -132,7 +133,7 @@ class APT_HIDDEN pkgCacheGenerator                                  /*{{{*/
 
    public:
 
 
    public:
 

-   enum StringType { MIXED, PKGNAME, VERSIONNUMBER, SECTION };
+   enum StringType { MIXED, PKGNAME, VERSIONNUMBER, SECTION, TAG };

    map_stringitem_t StoreString(StringType const type, const char * S, unsigned int const Size);
 
 #ifdef APT_PKG_EXPOSE_STRING_VIEW
    map_stringitem_t StoreString(StringType const type, const char * S, unsigned int const Size);
 
 #ifdef APT_PKG_EXPOSE_STRING_VIEW