apt manpage is built from xml nowadays like the rest

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

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index e37899ec679446a6ba24a1a47b597ab9ffceb63f..99b64651390f81ddff9c274b5131bb0c5e87f827 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -119,7 +119,7 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
    std::vector<std::string> list_section = StringSplit(Section, " ");
    
    for (std::vector<std::string>::const_iterator U = list_uris.begin();
    std::vector<std::string> list_section = StringSplit(Section, " ");
    
    for (std::vector<std::string>::const_iterator U = list_uris.begin();

-        U != list_uris.end(); U++)
+        U != list_uris.end(); ++U)

    {
       std::string URI = (*U);
       if (!FixupURI(URI))
    {
       std::string URI = (*U);
       if (!FixupURI(URI))


@@ -129,10 +129,10 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
       }
 
       for (std::vector<std::string>::const_iterator I = list_dist.begin();
       }
 
       for (std::vector<std::string>::const_iterator I = list_dist.begin();

-           I != list_dist.end(); I++)
+           I != list_dist.end(); ++I)

       {
          for (std::vector<std::string>::const_iterator J = list_section.begin();
       {
          for (std::vector<std::string>::const_iterator J = list_section.begin();

-              J != list_section.end(); J++)
+              J != list_section.end(); ++J)

          {
             if (CreateItem(List, URI, (*I), (*J), Options) == false)
             {
          {
             if (CreateItem(List, URI, (*I), (*J), Options) == false)
             {


@@ -236,11 +236,11 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
 // SourceList::pkgSourceList - Constructors                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // SourceList::pkgSourceList - Constructors                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-pkgSourceList::pkgSourceList()
+pkgSourceList::pkgSourceList() : d(NULL)

 {
 }
 
 {
 }
 

-pkgSourceList::pkgSourceList(string File)
+pkgSourceList::pkgSourceList(string File) : d(NULL)

 {
    Read(File);
 }
 {
    Read(File);
 }


@@ -331,7 +331,7 @@ bool pkgSourceList::ParseFileOldStyle(string File)
 {
    // Open the stream for reading
    ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);
 {
    // Open the stream for reading
    ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);

-   if (!F != 0)
+   if (F.fail() == true)

       return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
 
    // CNC:2003-12-10 - 300 is too short.
       return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
 
    // CNC:2003-12-10 - 300 is too short.


@@ -408,7 +408,7 @@ int pkgSourceList::ParseFileDeb822(string File)
       string const types = Tags.FindS("Types");
       std::vector<std::string> list_types = StringSplit(types, " ");
       for (std::vector<std::string>::const_iterator I = list_types.begin();
       string const types = Tags.FindS("Types");
       std::vector<std::string> list_types = StringSplit(types, " ");
       for (std::vector<std::string>::const_iterator I = list_types.begin();

-        I != list_types.end(); I++)
+        I != list_types.end(); ++I)

       {
          Type *Parse = Type::GetType((*I).c_str());
          if (Parse == 0)
       {
          Type *Parse = Type::GetType((*I).c_str());
          if (Parse == 0)