apt-pkg/cdrom.h: move new member to the end to minimize ABI risk

[apt.git] / cmdline / apt-extracttemplates.cc

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index c87b436ba65e85429f7eb6e8e374acabe6dcc476..07bc0c25d053d6a17453d67e3d84d87078211bf5 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -222,8 +222,8 @@ bool DebFile::ParseInfo()
 /* */
 int ShowHelp(void)
 {
-       ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+       ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+           COMMON_ARCH,__DATE__,__TIME__);
 
        if (_config->FindB("version") == true) 
                return 0;
@@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
        char fn[512];
        static int i;
-        char *tempdir = NULL;
+       const char *tempdir = NULL;
 
         tempdir = getenv("TMPDIR");
         if (tempdir == NULL)
@@ -296,8 +296,7 @@ bool Go(CommandLine &CmdL)
        MMap *Map = 0;
        pkgSourceList List;
        List.ReadMainList();
-       OpProgress Prog;
-       pkgMakeStatusCache(List,Prog,&Map,true);
+       pkgCacheGenerator::MakeStatusCache(List,NULL,&Map,true);
        if (Map == 0)
           return false;
        DebFile::Cache = new pkgCache(Map);
@@ -348,8 +347,7 @@ bool Go(CommandLine &CmdL)
        return !_error->PendingError();
 }
                                                                        /*}}}*/
-
-int main(int argc, const char **argv)
+int main(int argc, const char **argv)                                  /*{{{*/
 {
        CommandLine::Args Args[] = {
                {'h',"help","help",0},
@@ -391,3 +389,4 @@ int main(int argc, const char **argv)
        
        return 0;
 }
+                                                                       /*}}}*/