Selaa lähdekoodia

debListParser: Convert another ParseDepends to StringView

I overlooked this

Gbp-Dch: ignore
Julian Andres Klode 10 vuotta sitten
vanhempi
commit
e9a1e5f9a3
2 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 2 2
      apt-pkg/deb/deblistparser.cc
  2. 3 1
      apt-pkg/deb/deblistparser.h

+ 2 - 2
apt-pkg/deb/deblistparser.cc

@@ -809,7 +809,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
 /* This is the higher level depends parser. It takes a tag and generates
    a complete depends tree for the given version. */
 bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
-				 const char *Tag,unsigned int Type)
+				 StringView Tag,unsigned int Type)
 {
    const char *Start;
    const char *Stop;
@@ -826,7 +826,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
 
       Start = ParseDepends(Start, Stop, Package, Version, Op, false, false, false);
       if (Start == 0)
-	 return _error->Error("Problem parsing dependency %s",Tag);
+	 return _error->Error("Problem parsing dependency %.*s",(int)Tag.length(), Tag.data());
       size_t const found = Package.rfind(':');
 
       if (found == string::npos)

+ 3 - 1
apt-pkg/deb/deblistparser.h

@@ -50,8 +50,10 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
    map_filesize_t iOffset;
 
    virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
-   bool ParseDepends(pkgCache::VerIterator &Ver,const char *Tag,
+#ifdef APT_PKG_EXPOSE_STRING_VIEW
+   bool ParseDepends(pkgCache::VerIterator &Ver, APT::StringView Tag,
 		     unsigned int Type);
+#endif
    bool ParseProvides(pkgCache::VerIterator &Ver);
 
 #ifdef APT_PKG_EXPOSE_STRING_VIEW