fix various -Wall warnings

[apt.git] / apt-pkg / contrib / cdromutl.cc

diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index f6e4bc2164e9d404c7262906083066cccdaf69e6..b6524a1785f48e0f258aaf2630460d617377dc55 100644 (file)
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cdromutl.cc,v 1.9 1999/08/30 07:48:04 jgg Exp $
+// $Id: cdromutl.cc,v 1.12 2001/02/20 07:03:17 jgg Exp $

 /* ######################################################################
    
    CDROM Utilities - Some functions to manipulate CDROM mounts.
 /* ######################################################################
    
    CDROM Utilities - Some functions to manipulate CDROM mounts.


@@ -10,18 +10,17 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/cdromutl.h"
-#endif

 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 
 #include <apt-pkg/cdromutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 

+#include <apti18n.h>
+    

 #include <sys/wait.h>
 #include <sys/errno.h>
 #include <sys/wait.h>
 #include <sys/errno.h>

-#include <sys/vfs.h>
+#include <sys/statvfs.h>

 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/stat.h>


@@ -50,7 +49,7 @@ bool IsMounted(string &Path)
    struct stat Buf,Buf2;
    if (stat(Path.c_str(),&Buf) != 0 || 
        stat((Path + "../").c_str(),&Buf2) != 0)
    struct stat Buf,Buf2;
    if (stat(Path.c_str(),&Buf) != 0 || 
        stat((Path + "../").c_str(),&Buf2) != 0)

-      return _error->Errno("stat","Unable to stat the mount point %s",Path.c_str());
+      return _error->Errno("stat",_("Unable to stat the mount point %s"),Path.c_str());

 
    if (Buf.st_dev == Buf2.st_dev)
       return false;
 
    if (Buf.st_dev == Buf2.st_dev)
       return false;


@@ -93,7 +92,7 @@ bool UnmountCdrom(string Path)
    }
 
    // Wait for mount
    }
 
    // Wait for mount

-   return ExecWait(Child,"mount",true);
+   return ExecWait(Child,"umount",true);

 }
                                                                        /*}}}*/
 // MountCdrom - Mount a cdrom                                          /*{{{*/
 }
                                                                        /*}}}*/
 // MountCdrom - Mount a cdrom                                          /*{{{*/


@@ -144,11 +143,11 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
 
    string StartDir = SafeGetCWD();
    if (chdir(CD.c_str()) != 0)
 
    string StartDir = SafeGetCWD();
    if (chdir(CD.c_str()) != 0)

-      return _error->Errno("chdir","Unable to change to %s",CD.c_str());
+      return _error->Errno("chdir",_("Unable to change to %s"),CD.c_str());

    
    DIR *D = opendir(".");
    if (D == 0)
    
    DIR *D = opendir(".");
    if (D == 0)

-      return _error->Errno("opendir","Unable to read %s",CD.c_str());
+      return _error->Errno("opendir",_("Unable to read %s"),CD.c_str());

       
    /* Run over the directory, we assume that the reader order will never
       change as the media is read-only. In theory if the kernel did
       
    /* Run over the directory, we assume that the reader order will never
       change as the media is read-only. In theory if the kernel did


@@ -170,22 +169,23 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
         struct stat Buf;
         if (stat(Dir->d_name,&Buf) != 0)
            continue;
         struct stat Buf;
         if (stat(Dir->d_name,&Buf) != 0)
            continue;

-        sprintf(S,"%lu",Buf.st_mtime);
+        sprintf(S,"%lu",(unsigned long)Buf.st_mtime);

       }
       
       Hash.Add(S);
       Hash.Add(Dir->d_name);
    };
    
       }
       
       Hash.Add(S);
       Hash.Add(Dir->d_name);
    };
    

-   chdir(StartDir.c_str());
+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());

    closedir(D);
    
    // Some stats from the fsys
    if (_config->FindB("Debug::identcdrom",false) == false)
    {
    closedir(D);
    
    // Some stats from the fsys
    if (_config->FindB("Debug::identcdrom",false) == false)
    {

-      struct statfs Buf;
-      if (statfs(CD.c_str(),&Buf) != 0)
-        return _error->Errno("statfs","Failed to stat the cdrom");
+      struct statvfs Buf;
+      if (statvfs(CD.c_str(),&Buf) != 0)
+        return _error->Errno("statfs",_("Failed to stat the cdrom"));

       
       // We use a kilobyte block size to advoid overflow
       sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),
       
       // We use a kilobyte block size to advoid overflow
       sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),