[BACK]Return to roaming_common.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/roaming_common.c between version 1.1 and 1.2

version 1.1, 2009/05/28 16:50:16 version 1.2, 2009/06/12 20:43:22
Line 55 
Line 55 
 }  }
   
 void  void
 roam_set_bytes(u_int64_t sent, u_int64_t recv)  roam_set_bytes(u_int64_t sent, u_int64_t recvd)
 {  {
         read_bytes = recv;          read_bytes = recvd;
         write_bytes = sent;          write_bytes = sent;
 }  }
   
Line 70 
Line 70 
         if (ret > 0 && !resume_in_progress) {          if (ret > 0 && !resume_in_progress) {
                 write_bytes += ret;                  write_bytes += ret;
         }          }
         debug("Wrote %d bytes for a total of %lld", ret, write_bytes);          debug("Wrote %ld bytes for a total of %lld", (long)ret, write_bytes);
         return ret;          return ret;
 }  }
   
Line 86 
Line 86 
         return ret;          return ret;
 }  }
   
 ssize_t  size_t
 roaming_atomicio(ssize_t(*f)(), int fd, void *buf, size_t count)  roaming_atomicio(ssize_t(*f)(int, void*, size_t), int fd, void *buf,
       size_t count)
 {  {
         ssize_t ret = atomicio(f, fd, buf, count);          size_t ret = atomicio(f, fd, buf, count);
   
         if ((f == write || f == vwrite) && ret > 0 && !resume_in_progress) {          if (f == vwrite && ret > 0 && !resume_in_progress) {
                 write_bytes += ret;                  write_bytes += ret;
         } else if (f == read && ret > 0 && !resume_in_progress) {          } else if (f == read && ret > 0 && !resume_in_progress) {
                 read_bytes += ret;                  read_bytes += ret;
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2