refactor _InitQuery()

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index f63aa88ab06e4a4baf410f69d7700f1abf14972c..4feb7bbfb9a3a478832500466cacfad4bb4b840c 100644 (file)
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -199,7 +199,7 @@ bool CacheDB::GetCurStat()
          in the database */
       
       /* Get the flags (and mtime) */
          in the database */
       
       /* Get the flags (and mtime) */

-      InitQuery("st");
+      InitQueryStats();

       // Ensure alignment of the returned structure
       Data.data = &CurStat;
       Data.ulen = sizeof(CurStat);
       // Ensure alignment of the returned structure
       Data.data = &CurStat;
       Data.ulen = sizeof(CurStat);


@@ -262,7 +262,7 @@ bool CacheDB::LoadSource()
    if ((CurStat.Flags & FlSource) == FlSource)
    {
       // Lookup the control information
    if ((CurStat.Flags & FlSource) == FlSource)
    {
       // Lookup the control information

-      InitQuery("cs");
+      InitQuerySource();

       if (Get() == true && Dsc.TakeDsc(Data.data, Data.size) == true)
       {
            return true;
       if (Get() == true && Dsc.TakeDsc(Data.data, Data.size) == true)
       {
            return true;


@@ -280,7 +280,7 @@ bool CacheDB::LoadSource()
       return _error->Error(_("Failed to read .dsc"));
    
    // Write back the control information
       return _error->Error(_("Failed to read .dsc"));
    
    // Write back the control information

-   InitQuery("cs");
+   InitQuerySource();

    if (Put(Dsc.Data, Dsc.Length) == true)
       CurStat.Flags |= FlSource;
 
    if (Put(Dsc.Data, Dsc.Length) == true)
       CurStat.Flags |= FlSource;
 


@@ -296,7 +296,7 @@ bool CacheDB::LoadControl()
    if ((CurStat.Flags & FlControl) == FlControl)
    {
       // Lookup the control information
    if ((CurStat.Flags & FlControl) == FlControl)
    {
       // Lookup the control information

-      InitQuery("cl");
+      InitQueryControl();

       if (Get() == true && Control.TakeControl(Data.data,Data.size) == true)
            return true;
       CurStat.Flags &= ~FlControl;
       if (Get() == true && Control.TakeControl(Data.data,Data.size) == true)
            return true;
       CurStat.Flags &= ~FlControl;


@@ -313,7 +313,7 @@ bool CacheDB::LoadControl()
       return _error->Error(_("Archive has no control record"));
    
    // Write back the control information
       return _error->Error(_("Archive has no control record"));
    
    // Write back the control information

-   InitQuery("cl");
+   InitQueryControl();

    if (Put(Control.Control,Control.Length) == true)
       CurStat.Flags |= FlControl;
    return true;
    if (Put(Control.Control,Control.Length) == true)
       CurStat.Flags |= FlControl;
    return true;


@@ -331,7 +331,7 @@ bool CacheDB::LoadContents(bool const &GenOnly)
         return true;
       
       // Lookup the contents information
         return true;
       
       // Lookup the contents information

-      InitQuery("cn");
+      InitQueryContent();

       if (Get() == true)
       {
         if (Contents.TakeContents(Data.data,Data.size) == true)
       if (Get() == true)
       {
         if (Contents.TakeContents(Data.data,Data.size) == true)


@@ -349,7 +349,7 @@ bool CacheDB::LoadContents(bool const &GenOnly)
       return false;        
    
    // Write back the control information
       return false;        
    
    // Write back the control information

-   InitQuery("cn");
+   InitQueryContent();

    if (Put(Contents.Data,Contents.CurSize) == true)
       CurStat.Flags |= FlContents;
    return true;
    if (Put(Contents.Data,Contents.CurSize) == true)
       CurStat.Flags |= FlContents;
    return true;


@@ -519,7 +519,7 @@ bool CacheDB::Finish()
    // Write the stat information
    CurStat.Flags = htonl(CurStat.Flags);
    CurStat.FileSize = htonl(CurStat.FileSize);
    // Write the stat information
    CurStat.Flags = htonl(CurStat.Flags);
    CurStat.FileSize = htonl(CurStat.FileSize);

-   InitQuery("st");
+   InitQueryStats();

    Put(&CurStat,sizeof(CurStat));
    CurStat.Flags = ntohl(CurStat.Flags);
    CurStat.FileSize = ntohl(CurStat.FileSize);
    Put(&CurStat,sizeof(CurStat));
    CurStat.Flags = ntohl(CurStat.Flags);
    CurStat.FileSize = ntohl(CurStat.FileSize);

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 4e33c863505f02a0d5a832bd85fdab60d27bdadb..54a27494487e8f8641376bcebe854b72a572bc6d 100644 (file)
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -41,7 +41,7 @@ class CacheDB
    std::string DBFile;
 
    // Generate a key for the DB of a given type
    std::string DBFile;
 
    // Generate a key for the DB of a given type

-   inline void InitQuery(const char *Type)
+   void _InitQuery(const char *Type)

    {
       memset(&Key,0,sizeof(Key));
       memset(&Data,0,sizeof(Data));
    {
       memset(&Key,0,sizeof(Key));
       memset(&Data,0,sizeof(Data));


@@ -49,6 +49,19 @@ class CacheDB
       Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type);
    }
    
       Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type);
    }
    

+   void InitQueryStats() {
+      _InitQuery("st");
+   }
+   void InitQuerySource() {
+      _InitQuery("cs");
+   }
+   void InitQueryControl() {
+      _InitQuery("cl");
+   }
+   void InitQueryContent() {
+      _InitQuery("cn");
+   }
+

    inline bool Get() 
    {
       return Dbp->get(Dbp,0,&Key,&Data,0) == 0;
    inline bool Get() 
    {
       return Dbp->get(Dbp,0,&Key,&Data,0) == 0;