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

Diff for /src/usr.bin/rdist/common.c between version 1.23 and 1.24

version 1.23, 2009/10/27 23:59:42 version 1.24, 2011/04/10 15:47:28
Line 69 
Line 69 
 char                    defgroup[64] = "bin";   /* Default group */  char                    defgroup[64] = "bin";   /* Default group */
   
 static int sendcmdmsg(int, char *, size_t);  static int sendcmdmsg(int, char *, size_t);
 static int remread(int, u_char *, int);  static ssize_t remread(int, u_char *, size_t);
 static int remmore(void);  static int remmore(void);
   
 /*  /*
Line 354 
Line 354 
  */   */
 static u_char rembuf[BUFSIZ];  static u_char rembuf[BUFSIZ];
 static u_char *remptr;  static u_char *remptr;
 static int remleft;  static ssize_t remleft;
   
 #define remc() (--remleft < 0 ? remmore() : *remptr++)  #define remc() (--remleft < 0 ? remmore() : *remptr++)
   
 /*  /*
  * Back end to remote read()   * Back end to remote read()
  */   */
 static int  static ssize_t
 remread(int fd, u_char *buf, int bufsiz)  remread(int fd, u_char *buf, size_t bufsiz)
 {  {
         return(read(fd, (char *)buf, bufsiz));          return(read(fd, (char *)buf, bufsiz));
 }  }
Line 452 
Line 452 
 /*  /*
  * Non-line-oriented remote read.   * Non-line-oriented remote read.
  */   */
 int  ssize_t
 readrem(char *p, int space)  readrem(char *p, ssize_t space)
 {  {
         if (remleft <= 0) {          if (remleft <= 0) {
                 /*                  /*
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24