--- ray/src/util/rtcontrib.c 2010/09/26 15:44:00 1.57 +++ ray/src/util/rtcontrib.c 2010/10/05 18:05:22 1.58 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtcontrib.c,v 1.57 2010/09/26 15:44:00 greg Exp $"; +static const char RCSid[] = "$Id: rtcontrib.c,v 1.58 2010/10/05 18:05:22 greg Exp $"; #endif /* * Gather rtrace output to compute contributions from particular sources @@ -21,7 +21,7 @@ static const char RCSid[] = "$Id: rtcontrib.c,v 1.57 2 #define MAXMODLIST 1024 /* maximum modifiers we'll track */ #endif -int treebufsiz = BUFSIZ; /* current tree buffer size */ +size_t treebufsiz = BUFSIZ; /* current tree buffer size */ typedef double DCOLOR[3]; /* double-precision color */ @@ -93,9 +93,9 @@ struct rtproc { struct rtproc *next; /* next in list of processes */ SUBPROC pd; /* rtrace pipe descriptors */ unsigned long raynum; /* ray number for this tree */ - int bsiz; /* ray tree buffer length */ + size_t bsiz; /* ray tree buffer length */ char *buf; /* ray tree buffer */ - int nbr; /* number of bytes from rtrace */ + size_t nbr; /* number of bytes from rtrace */ }; /* rtrace process buffer */ /* rtrace command and defaults */ @@ -1078,7 +1078,7 @@ wait_rproc(void) { struct rtproc *rtfree = NULL; fd_set readset, errset; - int nr; + ssize_t nr; struct rtproc *rt; int n;