Compile of apt-cache

[apt.git] / apt-pkg / pkgcachegen.cc

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 634179bdd4f20bd9ac0c56052fd395516bceca4c..e0f8f3a197c6ffbbae51193da2f283170656c749 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: pkgcachegen.cc,v 1.4 1998/07/05 05:33:56 jgg Exp $
+// $Id: pkgcachegen.cc,v 1.9 1998/07/12 23:58:34 jgg Exp $
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
@@ -10,9 +10,14 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#include <pkglib/pkgcachegen.h>
-#include <pkglib/error.h>
-#include <pkglib/version.h>
+#ifdef __GNUG__
+#pragma implementation "apt-pkg/pkgcachegen.h"
+#endif
+
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/version.h>
+#include <strutl.h>
 
 #include <sys/stat.h>
 #include <unistd.h>
@@ -62,11 +67,12 @@ bool pkgCacheGenerator::MergeList(ListParser &List)
    while (List.Step() == true)
    {
       // Get a pointer to the package structure
-      string Package = List.Package();
-      pkgCache::PkgIterator Pkg = Cache.FindPkg(Package);
+      string PackageName = List.Package();
+      pkgCache::PkgIterator Pkg;
+      Cache.FindPkg(PackageName);
       if (Pkg.end() == true)
       {
-        if (NewPackage(Pkg,Package) == false)
+        if (NewPackage(Pkg,PackageName) == false)
            return false;
       }
       
@@ -83,7 +89,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List)
 
       pkgCache::VerIterator Ver = Pkg.VersionList();
       unsigned long *Last = &Pkg->VersionList;
-      int Res;
+      int Res = 1;
       for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
       {
         Res = pkgVersionCompare(Version.begin(),Version.end(),Ver.VerStr(),
@@ -196,7 +202,8 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
 /* This creates a dependency element in the tree. It is linked to the
    version and to the package that it is pointing to. */
 bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
-                                              string Package,string Version,
+                                              string PackageName,
+                                              string Version,
                                               unsigned int Op,
                                               unsigned int Type)
 {
@@ -215,9 +222,9 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
    Dep->ID = Cache.HeaderP->DependsCount++;
    
    // Locate the target package
-   pkgCache::PkgIterator Pkg = Cache.FindPkg(Package);
+   pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
    if (Pkg.end() == true)
-      if (Owner->NewPackage(Pkg,Package) == false)
+      if (Owner->NewPackage(Pkg,PackageName) == false)
         return false;
    
    // Probe the reverse dependency list for a version string that matches
@@ -250,7 +257,8 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver,
 // ---------------------------------------------------------------------
 /* */
 bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
-                                              string Package,string Version)
+                                              string PackageName,
+                                               string Version)
 {
    pkgCache &Cache = Owner->Cache;
    
@@ -268,9 +276,9 @@ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver,
       return false;
    
    // Locate the target package
-   pkgCache::PkgIterator Pkg = Cache.FindPkg(Package);
+   pkgCache::PkgIterator Pkg = Cache.FindPkg(PackageName);
    if (Pkg.end() == true)
-      if (Owner->NewPackage(Pkg,Package) == false)
+      if (Owner->NewPackage(Pkg,PackageName) == false)
         return false;
    
    // Link it to the package
@@ -322,9 +330,7 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S,
    for (; I != Cache.StringItemP; Last = &I->NextItem, 
         I = Cache.StringItemP + I->NextItem)
    {
-      Res = strncmp(Cache.StrP + I->String,S,Size);
-      if (Res == 0 && *(Cache.StrP + I->String + Size) != 0)
-        Res = 1;
+      Res = stringcmp(S,S+Size,Cache.StrP + I->String);
       if (Res >= 0)
         break;
    }