- various "cosmetics" cleanups to shut up gcc complaints on higher warning
authorpmatilai <pmatilai>
Mon, 12 Jun 2006 14:24:39 +0000 (14:24 +0000)
committerpmatilai <pmatilai>
Mon, 12 Jun 2006 14:24:39 +0000 (14:24 +0000)
  levels (Ralf)

14 files changed:
apt-pkg/acquire.cc
apt-pkg/cacheiterators.h
apt-pkg/contrib/configuration.cc
apt-pkg/contrib/error.cc
apt-pkg/contrib/progress.cc
apt-pkg/contrib/strutl.cc
apt-pkg/pkgcache.cc
apt-pkg/pkgcache.h
apt-pkg/rpm/rpmindexfile.cc
methods/cdrom.cc
methods/ftp.cc
methods/gzip.cc
methods/http.cc
methods/rsh.cc

index 3f2f3f8..2682c09 100644 (file)
@@ -399,7 +399,7 @@ void pkgAcquire::Bump()
 pkgAcquire::Worker *pkgAcquire::WorkerStep(Worker *I)
 {
    return I->NextAcquire;
-};
+}
                                                                        /*}}}*/
 // Acquire::Clean - Cleans a directory                                 /*{{{*/
 // ---------------------------------------------------------------------
index 06855b6..a3c837d 100644 (file)
@@ -352,18 +352,18 @@ class pkgCache::VerFileIterator
 
 // Inlined Begin functions cant be in the class because of order problems
 inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const
-       {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);};
+       {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);}
 inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const
-       {return VerIterator(*Owner,Owner->VerP + Pkg->CurrentVer);};
+       {return VerIterator(*Owner,Owner->VerP + Pkg->CurrentVer);}
 inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const
-       {return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);};
+       {return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);}
 inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const
-       {return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);};
+       {return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);}
 inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
-       {return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);};
+       {return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);}
 inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
-       {return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);};
+       {return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);}
 inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
-       {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);};
+       {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);}
 
 #endif
index 6968ce6..fcd5192 100644 (file)
@@ -48,7 +48,7 @@ Configuration::Configuration() : ToFree(true)
 }
 Configuration::Configuration(const Item *Root) : Root((Item *)Root), ToFree(false)
 {
-};
+}
 
 // CNC:2003-02-23 - Copy constructor.
 Configuration::Configuration(Configuration &Conf) : ToFree(true)
index 202f061..2295cb5 100644 (file)
@@ -222,7 +222,7 @@ void GlobalError::Discard()
    }
    
    PendingFlag = false;
-};
+}
                                                                        /*}}}*/
 // GlobalError::Insert - Insert a new item at the end                  /*{{{*/
 // ---------------------------------------------------------------------
index c80e07e..65482e8 100644 (file)
@@ -140,7 +140,7 @@ OpTextProgress::OpTextProgress(Configuration &Config) :
       NoUpdate = true;
    if (Config.FindI("quiet",0) >= 2)
       NoDisplay = true;
-};
+}
                                                                        /*}}}*/
 // OpTextProgress::Done - Clean up the display                         /*{{{*/
 // ---------------------------------------------------------------------
index a90943f..a360821 100644 (file)
@@ -55,7 +55,7 @@ char *_strstrip(char *String)
    End++;
    *End = 0;
    return String;
-};
+}
                                                                        /*}}}*/
 // strtabexpand - Converts tabs into 8 spaces                          /*{{{*/
 // ---------------------------------------------------------------------
index a61b6b3..ced19b8 100644 (file)
@@ -290,7 +290,7 @@ void pkgCache::PkgIterator::operator ++(int)
       HashIndex++;
       Pkg = Owner->PkgP + Owner->HeaderP->HashTable[HashIndex];
    }
-};
+}
                                                                        /*}}}*/
 // PkgIterator::State - Check the State of the package                 /*{{{*/
 // ---------------------------------------------------------------------
index ecd7ebc..9e4cb72 100644 (file)
@@ -325,13 +325,13 @@ inline unsigned long pkgCache::sHash(const char *Str) const
 #undef hash_count
 
 inline pkgCache::PkgIterator pkgCache::PkgBegin() 
-       {return PkgIterator(*this);};
+       {return PkgIterator(*this);}
 inline pkgCache::PkgIterator pkgCache::PkgEnd() 
-       {return PkgIterator(*this,PkgP);};
+       {return PkgIterator(*this,PkgP);}
 inline pkgCache::PkgFileIterator pkgCache::FileBegin()
-       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);};
+       {return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);}
 inline pkgCache::PkgFileIterator pkgCache::FileEnd()
-       {return PkgFileIterator(*this,PkgFileP);};
+       {return PkgFileIterator(*this,PkgFileP);}
 
 // Oh I wish for Real Name Space Support
 class pkgCache::Namespace
index f8d71ac..5e2d45a 100644 (file)
@@ -606,7 +606,7 @@ string rpmRepomdIndex::ReleaseInfo(string Type) const
    Info += " ";
    Info += Type;
    return Info;
-};
+}
 
 string rpmRepomdIndex::Info(string Type) const 
 {
@@ -679,7 +679,7 @@ string rpmRepomdIndex::Describe(bool Short) const
 string rpmRepomdIndex::IndexFile(string Type) const
 {
    return _config->FindDir("Dir::State::lists")+URItoFileName(IndexURI(Type));
-};
+}
 
 
 bool rpmRepomdIndex::Exists() const
index d90fd1e..5ebfe16 100644 (file)
@@ -58,7 +58,7 @@ CDROMMethod::CDROMMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly |
                                           DatabaseLoaded(false), 
                                           Mounted(false)
 {
-};
+}
                                                                        /*}}}*/
 // CNC:2004-04-27
 // CDROMMethod::PreferredURI() -                                       /*{{{*/
index ee35f80..95afe54 100644 (file)
@@ -56,9 +56,9 @@ struct AFMap
 };
 
 #ifndef AF_INET6
-struct AFMap AFMap[] = {{AF_INET,1},{}};
+struct AFMap AFMap[] = {{AF_INET,1},{0,0}};
 #else
-struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{}};
+struct AFMap AFMap[] = {{AF_INET,1},{AF_INET6,2},{0,0}};
 #endif
 
 unsigned long TimeOut = 120;
index 546207f..d49c7ac 100644 (file)
@@ -94,7 +94,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
    while (1) 
    {
       unsigned char Buffer[4*1024];
-      unsigned long Count;
+      ssize_t Count;
       
       Count = read(GzOut[0],Buffer,sizeof(Buffer));
       if (Count < 0 && errno == EINTR)
index 9156596..d9b2bc7 100644 (file)
@@ -87,7 +87,7 @@ void CircleBuf::Reset()
       delete Hash;
       Hash = new Hashes;
    }   
-};
+}
                                                                        /*}}}*/
 // CircleBuf::Read - Read from a FD into the circular buffer           /*{{{*/
 // ---------------------------------------------------------------------
@@ -1107,7 +1107,7 @@ bool HttpMethod::Fetch(FetchItem *)
    }
    
    return true;
-};
+}
                                                                        /*}}}*/
 // HttpMethod::Configuration - Handle a configuration message          /*{{{*/
 // ---------------------------------------------------------------------
index dabfd31..ad2e414 100644 (file)
@@ -362,7 +362,7 @@ RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig)
    signal(SIGINT,SigTerm);
    Server = 0;
    FailFd = -1;
-};
+}
                                                                        /*}}}*/
 // RSHMethod::Configuration - Handle a configuration message           /*{{{*/
 // ---------------------------------------------------------------------