fix: warning: extra ‘;’ [-Wpedantic]

Reported-By: gcc -Wpedantic
Git-Dch: Ignore

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index e4cd1dc3b8ff318a1befbf28a6cf09732fd762c5..101912f9d107f55114ac45a91e56c0659861178a 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -1080,7 +1080,7 @@ pkgPackageManager::DoInstallPostFork(APT::Progress::PackageManager *progress)
       return Failed;
    
    return Res;
       return Failed;
    
    return Res;

-};
+}

 #else
 pkgPackageManager::OrderResult
 pkgPackageManager::DoInstallPostFork(int statusFd)
 #else
 pkgPackageManager::OrderResult
 pkgPackageManager::DoInstallPostFork(int statusFd)

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 4972dcd04bbea1efb736513c4ae6cf30be2740b5..5bcd2045d26b6a1afcf972afde9756a387fe355a 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -47,8 +47,8 @@ class pkgRecords;
 namespace APT {
    namespace Progress {
       class PackageManager;
 namespace APT {
    namespace Progress {
       class PackageManager;

-   };
-};
+   }
+}

 
 
 class pkgPackageManager : protected pkgCache::Namespace
 
 
 class pkgPackageManager : protected pkgCache::Namespace

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 7770a32449ff41f32614db8869565c27d2362fcd..da45eb8d25229b5364fe5be7fee9bedc498b37ba 100644 (file)
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -34,18 +34,18 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-CacheDB::CacheDB(std::string const &DB) 
+CacheDB::CacheDB(std::string const &DB)

    : Dbp(0), Fd(NULL), DebFile(0)
 {
    TmpKey[0]='\0';
    ReadyDB(DB);
    : Dbp(0), Fd(NULL), DebFile(0)
 {
    TmpKey[0]='\0';
    ReadyDB(DB);

-};
+}

 
 CacheDB::~CacheDB()
 {
    ReadyDB();
    delete DebFile;
 
 CacheDB::~CacheDB()
 {
    ReadyDB();
    delete DebFile;

-};
+}

 
 // CacheDB::ReadyDB - Ready the DB2                                    /*{{{*/
 // ---------------------------------------------------------------------
 
 // CacheDB::ReadyDB - Ready the DB2                                    /*{{{*/
 // ---------------------------------------------------------------------

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index b40fd7df72865d1c367a293d922e1e33bd1c72c1..613963f6f2a442032249d18d1d5b0f501266e022 100644 (file)
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -99,8 +99,8 @@ class CacheDB
 
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),
 
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),

-                  FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5), 
-                  FlSHA512=(1<<6), FlSource=(1<<7),
+                  FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5),
+                  FlSHA512=(1<<6), FlSource=(1<<7)

    };
 
    // the on-disk format changed (FileSize increased to 64bit) in 
    };
 
    // the on-disk format changed (FileSize increased to 64bit) in 

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 91dd2b8bde68de0ed8d8859aee8debdabe810f5f..8c4181eda090c46dc59ab717a74a24e620897562 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -302,17 +302,17 @@ void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)
    DoPrint(Out,Top->BTreeRight,Buf);  
 }
                                                                        /*}}}*/
    DoPrint(Out,Top->BTreeRight,Buf);  
 }
                                                                        /*}}}*/

-// ContentsExtract Constructor                                         /*{{{*/
+// ContentsExtract Constructor                                         /*{{{*/

 ContentsExtract::ContentsExtract()
 ContentsExtract::ContentsExtract()

-   : Data(0), MaxSize(0), CurSize(0) 
+   : Data(0), MaxSize(0), CurSize(0)

 {
 {

-};
+}

                                                                        /*}}}*/
                                                                        /*}}}*/

-// ContentsExtract Destructor                                          /*{{{*/
+// ContentsExtract Destructor                                          /*{{{*/

 ContentsExtract::~ContentsExtract()
 {
    free(Data);
 ContentsExtract::~ContentsExtract()
 {
    free(Data);

-};
+}

                                                                        /*}}}*/
 // ContentsExtract::Read - Read the archive                            /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ContentsExtract::Read - Read the archive                            /*{{{*/
 // ---------------------------------------------------------------------