warning: cast from type A to type B casts away qualifiers [-Wcast-qual]

[apt.git] / methods / rsh.cc

diff --git a/methods/rsh.cc b/methods/rsh.cc
index a441220bfe0d211a4b75d38d16b6127a70388035..f065f6b89f52fe71778f469fd07eff0bfa668662 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -255,7 +255,7 @@ bool RSHConn::WriteMsg(std::string &Text,bool Sync,const char *Fmt,...)
                                                                        /*}}}*/
 // RSHConn::Size - Return the size of the file                         /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // RSHConn::Size - Return the size of the file                         /*{{{*/
 // ---------------------------------------------------------------------

-/* Right now for successfull transfer the file size must be known in 
+/* Right now for successful transfer the file size must be known in

    advance. */
 bool RSHConn::Size(const char *Path,unsigned long long &Size)
 {
    advance. */
 bool RSHConn::Size(const char *Path,unsigned long long &Size)
 {


@@ -368,7 +368,7 @@ RSHMethod::RSHMethod() : pkgAcqMethod("1.0",SendConfig)
    signal(SIGINT,SigTerm);
    Server = 0;
    FailFd = -1;
    signal(SIGINT,SigTerm);
    Server = 0;
    FailFd = -1;

-};
+}

                                                                        /*}}}*/
 // RSHMethod::Configuration - Handle a configuration message           /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // RSHMethod::Configuration - Handle a configuration message           /*{{{*/
 // ---------------------------------------------------------------------


@@ -396,11 +396,11 @@ void RSHMethod::SigTerm(int sig)
       _exit(100);
 
    // Transfer the modification times
       _exit(100);
 
    // Transfer the modification times

-   struct timespec times[2];
+   struct timeval times[2];

    times[0].tv_sec = FailTime;
    times[1].tv_sec = FailTime;
    times[0].tv_sec = FailTime;
    times[1].tv_sec = FailTime;

-   times[0].tv_nsec = times[1].tv_nsec = 0;
-   futimens(FailFd, times);
+   times[0].tv_usec = times[1].tv_usec = 0;
+   utimes(FailFile.c_str(), times);

    close(FailFd);
 
    _exit(100);
    close(FailFd);
 
    _exit(100);


@@ -488,11 +488,11 @@ bool RSHMethod::Fetch(FetchItem *Itm)
         Fd.Close();
 
         // Timestamp
         Fd.Close();
 
         // Timestamp

-        struct timespec times[2];
+        struct timeval times[2];

         times[0].tv_sec = FailTime;
         times[1].tv_sec = FailTime;
         times[0].tv_sec = FailTime;
         times[1].tv_sec = FailTime;

-        times[0].tv_nsec = times[1].tv_nsec = 0;
-        futimens(FailFd, times);
+        times[0].tv_usec = times[1].tv_usec = 0;
+        utimes(FailFile.c_str(), times);

 
         // If the file is missing we hard fail otherwise transient fail
         if (Missing == true)
 
         // If the file is missing we hard fail otherwise transient fail
         if (Missing == true)


@@ -502,11 +502,11 @@ bool RSHMethod::Fetch(FetchItem *Itm)
       }
 
       Res.Size = Fd.Size();
       }
 
       Res.Size = Fd.Size();

-      struct timespec times[2];
+      struct timeval times[2];

       times[0].tv_sec = FailTime;
       times[1].tv_sec = FailTime;
       times[0].tv_sec = FailTime;
       times[1].tv_sec = FailTime;

-      times[0].tv_nsec = times[1].tv_nsec = 0;
-      futimens(Fd.Fd(), times);
+      times[0].tv_usec = times[1].tv_usec = 0;
+      utimes(Fd.Name().c_str(), times);

       FailFd = -1;
    }
 
       FailFd = -1;
    }