Revision: 42214
http://brlcad.svn.sourceforge.net/brlcad/?rev=42214&view=rev
Author: brlcad
Date: 2011-01-13 05:38:03 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
fix the remainder of the fread/fwrite/scanf/read/write return value warnings,
adding simple diagnostic perror() error reporting if a failure is detected.
Modified Paths:
--------------
brlcad/trunk/src/util/Makefile.am
brlcad/trunk/src/util/lowp.c
brlcad/trunk/src/util/orle-pix.c
brlcad/trunk/src/util/pix-bw.c
brlcad/trunk/src/util/pix-bw3.c
brlcad/trunk/src/util/pix-ppm.c
brlcad/trunk/src/util/pixbackgnd.c
brlcad/trunk/src/util/pixblend.c
brlcad/trunk/src/util/pixdsplit.c
brlcad/trunk/src/util/pixelswap.c
brlcad/trunk/src/util/pixfade.c
brlcad/trunk/src/util/pixfilter.c
brlcad/trunk/src/util/pixmerge.c
brlcad/trunk/src/util/pixrect.c
brlcad/trunk/src/util/pixscale.c
brlcad/trunk/src/util/pixsubst.c
brlcad/trunk/src/util/pixtile.c
brlcad/trunk/src/util/pixuntile.c
brlcad/trunk/src/util/pl-asc.c
brlcad/trunk/src/util/pl-pl.c
brlcad/trunk/src/util/pl-ps.c
brlcad/trunk/src/util/pl-tek.c
brlcad/trunk/src/util/pldebug.c
brlcad/trunk/src/util/plrot.c
brlcad/trunk/src/util/plstat.c
brlcad/trunk/src/util/png-bw.c
brlcad/trunk/src/util/png-pix.c
brlcad/trunk/src/util/sun-pix.c
brlcad/trunk/src/util/terrain.c
Modified: brlcad/trunk/src/util/Makefile.am
===================================================================
--- brlcad/trunk/src/util/Makefile.am 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/Makefile.am 2011-01-13 05:38:03 UTC (rev 42214)
@@ -150,7 +150,7 @@
xyz-pl \
yuv-pix
-AM_CPPFLAGS = ${TCL_CPPFLAGS}
+AM_CPPFLAGS = ${TCL_CPPFLAGS} ${STRICT_FLAGS}
noinst_PROGRAMS = \
${PC_TEST} \
Modified: brlcad/trunk/src/util/lowp.c
===================================================================
--- brlcad/trunk/src/util/lowp.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/lowp.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -56,6 +56,7 @@
{
int x, y;
int readval;
+ ssize_t ret;
if (argc < 2) {
fprintf(stderr, "%s", usage);
@@ -109,7 +110,9 @@
/* First and last are black */
memset(out1, 0, pix_line*3);
- write(1, out1, pix_line*3);
+ ret = write(1, out1, pix_line*3);
+ if (ret < 0)
+ perror("write");
for (y=1; y < nlines-2; y++) {
static unsigned char *op;
@@ -140,12 +143,16 @@
c[ i-3] + c[ i ]*3 + c[ i+3]
) / 84;
}
- write(1, out1, pix_line*3);
+ ret = write(1, out1, pix_line*3);
+ if (ret < 0)
+ perror("write");
}
/* First and last are black */
memset(out1, 0, pix_line*3);
- write(1, out1, pix_line*3);
+ ret = write(1, out1, pix_line*3);
+ if (ret < 0)
+ perror("write");
return 0;
}
Modified: brlcad/trunk/src/util/orle-pix.c
===================================================================
--- brlcad/trunk/src/util/orle-pix.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/orle-pix.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -139,7 +139,9 @@
}
} else {
/* .pix files are streams of RGBpixels */
- write(1, scanbuf, fb_size*sizeof(RGBpixel));
+ ssize_t ret = write(1, scanbuf, fb_size*sizeof(RGBpixel));
+ if (ret < 0)
+ perror("write");
}
} /* end for */
} /* end block */
Modified: brlcad/trunk/src/util/pix-bw.c
===================================================================
--- brlcad/trunk/src/util/pix-bw.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pix-bw.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -61,6 +61,7 @@
int clip_high, clip_low;
double value;
FILE *finp, *foutp;
+ size_t ret;
while (argc > 1 && argv[1][0] == '-') {
if (strcmp(argv[1], "-ntsc") == 0) {
@@ -164,7 +165,9 @@
obuf[out] = ((int)ibuf[in] + (int)ibuf[in+1] +
(int)ibuf[in+2]) / 3;
}
- fwrite(obuf, sizeof(char), num/3, foutp);
+ ret = fwrite(obuf, sizeof(char), num/3, foutp);
+ if (ret != (size_t)num/3)
+ perror("fwrite");
}
if (clip_high != 0 || clip_low != 0) {
Modified: brlcad/trunk/src/util/pix-bw3.c
===================================================================
--- brlcad/trunk/src/util/pix-bw3.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pix-bw3.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -43,6 +43,7 @@
int i, num;
FILE *rfp, *bfp, *gfp;
unsigned char *ibufp;
+ size_t ret;
if (argc != 4 || isatty(fileno(stdin))) {
bu_exit(1, "usage: pix-bw3 redout greenout blueout < file.pix\n");
@@ -63,9 +64,15 @@
green[i] = *ibufp++;
blue[i] = *ibufp++;
}
- fwrite(red, sizeof(*red), num/3, rfp);
- fwrite(green, sizeof(*green), num/3, gfp);
- fwrite(blue, sizeof(*blue), num/3, bfp);
+ ret = fwrite(red, sizeof(*red), num/3, rfp);
+ if (ret < (size_t)num/3)
+ perror("fwrite");
+ ret = fwrite(green, sizeof(*green), num/3, gfp);
+ if (ret < (size_t)num/3)
+ perror("fwrite");
+ ret = fwrite(blue, sizeof(*blue), num/3, bfp);
+ if (ret < (size_t)num/3)
+ perror("fwrite");
}
return 0;
Modified: brlcad/trunk/src/util/pix-ppm.c
===================================================================
--- brlcad/trunk/src/util/pix-ppm.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pix-ppm.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -119,6 +119,7 @@
{
int i;
char *row;
+ size_t ret;
if (bytes_per_pixel == 1) {
/* PGM magic number */
@@ -142,7 +143,9 @@
for (i = 0; i < height; i++) {
row = data + (height-1 - i) * width * bytes_per_pixel;
- fwrite(row, 1, width * bytes_per_pixel, fp);
+ ret = fwrite(row, 1, width * bytes_per_pixel, fp);
+ if (ret < (size_t)width * bytes_per_pixel)
+ perror("fwrite");
}
}
Modified: brlcad/trunk/src/util/pixbackgnd.c
===================================================================
--- brlcad/trunk/src/util/pixbackgnd.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixbackgnd.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -237,6 +237,7 @@
unsigned char *horiz_buf;
unsigned char *vert_buf;
unsigned char *vp;
+ ssize_t ret;
if (!get_args(argc, argv) || isatty(fileno(stdout))) {
(void)fputs(usage, stderr);
@@ -310,7 +311,9 @@
*op-- = vp[1];
*op-- = *vp;
}
- write(1, horiz_buf, file_width*3);
+ ret = write(1, horiz_buf, file_width*3);
+ if (ret < 0)
+ perror("write");
}
} else {
/* Inverted: top-to-bottom. Good with cat-fb */
@@ -324,7 +327,9 @@
*op-- = vp[1];
*op-- = *vp;
}
- write(1, horiz_buf, file_width*3);
+ ret = write(1, horiz_buf, file_width*3);
+ if (ret < 0)
+ perror("write");
}
}
Modified: brlcad/trunk/src/util/pixblend.c
===================================================================
--- brlcad/trunk/src/util/pixblend.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixblend.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -159,6 +159,7 @@
int gthreshold = 0;
#endif
int c = 0;
+ size_t ret;
if (!get_args(argc, argv) || isatty(fileno(stdout))) {
(void)fputs(usage, stderr);
@@ -266,7 +267,9 @@
}
}
}
- fwrite(b3, 1, len, stdout);
+ ret = fwrite(b3, 1, len, stdout);
+ if (ret < len)
+ perror("fwrite");
}
return 0;
Modified: brlcad/trunk/src/util/pixdsplit.c
===================================================================
--- brlcad/trunk/src/util/pixdsplit.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixdsplit.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -75,6 +75,7 @@
int infd = 0; /* File descriptor */
int cfd = -1; /* " " */
int dfd = -1; /* " " */
+ ssize_t ret;
c_per_p = 3; cf_name = "-";
d_per_p = 1; df_name = "";
@@ -178,10 +179,16 @@
cbp += cwidth;
dbp += dwidth;
}
- if (cf_name)
- write(cfd, cbuf, i * cwidth);
- if (df_name)
- write(dfd, dbuf, i * dwidth);
+ if (cf_name) {
+ ret = write(cfd, cbuf, i * cwidth);
+ if (ret < 0)
+ perror("write");
+ }
+ if (df_name) {
+ ret = write(dfd, dbuf, i * dwidth);
+ if (ret < 0)
+ perror("write");
+ }
if (num % pwidth != 0)
bu_log("pixdsplit: WARNING: incomplete final pixel ignored\n");
}
Modified: brlcad/trunk/src/util/pixelswap.c
===================================================================
--- brlcad/trunk/src/util/pixelswap.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixelswap.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -96,6 +96,7 @@
{
int i, pixels;
unsigned char r, g, b, R, G, B;
+ size_t ret;
if ((i=parse_args(ac, av))+6 > ac)
usage("missing pixel value(s)\n");
@@ -134,7 +135,9 @@
}
}
- fwrite(obuf, 3, pixels, stdout);
+ ret = fwrite(obuf, 3, pixels, stdout);
+ if (ret != (size_t)pixels)
+ perror("fwrite");
}
return 0;
}
Modified: brlcad/trunk/src/util/pixfade.c
===================================================================
--- brlcad/trunk/src/util/pixfade.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixfade.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -167,7 +167,9 @@
else
cur_color.blue = t;
- fwrite(&cur_color, 1, 3, stdout);
+ ret = fwrite(&cur_color, 1, 3, stdout);
+ if (ret < 3)
+ perror("fwrite");
}
return 0;
}
Modified: brlcad/trunk/src/util/pixfilter.c
===================================================================
--- brlcad/trunk/src/util/pixfilter.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixfilter.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -141,6 +141,7 @@
int x, y, color;
int value, r1, r2, r3;
int max, min;
+ size_t ret;
/* Select Default Filter (low pass) */
select_filter("low");
@@ -162,10 +163,19 @@
bottom = &line1[0];
middle = &line2[0];
top = &line3[0];
- fread(bottom, sizeof(char), 3*width, infp);
- fread(middle, sizeof(char), 3*width, infp);
- fwrite(bottom, sizeof(char), 3*width, stdout);
+ ret = fread(bottom, sizeof(char), 3*width, infp);
+ if (ret < (size_t)3*width)
+ perror("fread");
+
+ ret = fread(middle, sizeof(char), 3*width, infp);
+ if (ret < (size_t)3*width)
+ perror("fread");
+
+ ret = fwrite(bottom, sizeof(char), 3*width, stdout);
+ if (ret < (size_t)3*width)
+ perror("fwrite");
+
if (verbose) {
for (x = 0; x < 11; x++)
fprintf(stderr, "kern[%d] = %d\n", x, kern[x]);
@@ -176,7 +186,10 @@
for (y = 1; y < height-1; y++) {
/* read in top line */
- fread(top, sizeof(char), 3*width, infp);
+ ret = fread(top, sizeof(char), 3*width, infp);
+ if (ret < (size_t)3*width)
+ perror("fread");
+
for (color = 0; color < 3; color++) {
obuf[0+color] = middle[0+color];
/* Filter a line */
@@ -200,7 +213,9 @@
}
obuf[3*(width-1)+color] = middle[3*(width-1)+color];
}
- fwrite(obuf, sizeof(char), 3*width, stdout);
+ ret = fwrite(obuf, sizeof(char), 3*width, stdout);
+ if (ret < (size_t)3*width)
+ perror("fwrite");
/* Adjust row pointers */
temp = bottom;
bottom = middle;
@@ -208,7 +223,9 @@
top = temp;
}
/* write out last line untouched */
- fwrite(top, sizeof(char), 3*width, stdout);
+ ret = fwrite(top, sizeof(char), 3*width, stdout);
+ if (ret < (size_t)3*width)
+ perror("fwrite");
/* Give advise on scaling factors */
if (verbose)
Modified: brlcad/trunk/src/util/pixmerge.c
===================================================================
--- brlcad/trunk/src/util/pixmerge.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixmerge.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -152,6 +152,7 @@
int
main(int argc, char **argv)
{
+ size_t ret;
if (!get_args(argc, argv) || isatty(fileno(stdout))) {
(void)fputs(usage, stderr);
@@ -254,7 +255,9 @@
}
bg_cnt++;
}
- fwrite(b3, width, len, stdout);
+ ret = fwrite(b3, width, len, stdout);
+ if (ret < (size_t)len)
+ perror("fwrite");
}
fprintf(stderr, "pixmerge: %ld foreground, %ld background\n",
fg_cnt, bg_cnt);
Modified: brlcad/trunk/src/util/pixrect.c
===================================================================
--- brlcad/trunk/src/util/pixrect.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixrect.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -57,6 +57,7 @@
{
int c;
int inputmode = INTERACTIVE;
+ int ret;
/* Get info from command line arguments */
while ((c = bu_getopt(argc, argv, "s:w:n:x:y:X:Y:S:W:N:#:")) != EOF) {
@@ -126,11 +127,19 @@
/* Get info */
printf("Area to extract (x, y) in pixels ");
- scanf("%d%d", &xnum, &ynum);
+ ret = scanf("%d%d", &xnum, &ynum);
+ if (ret != 2)
+ perror("scanf");
+
printf("Origin to extract from (0, 0 is lower left) ");
- scanf("%d%d", &xorig, &yorig);
+ ret = scanf("%d%d", &xorig, &yorig);
+ if (ret != 2)
+ perror("scanf");
+
printf("Scan line length of input file ");
scanf("%d", &linelen);
+ if (ret != 1)
+ perror("scanf");
}
/* Make sure nessecary variables set */
@@ -184,6 +193,7 @@
{
int row;
long offset;
+ size_t ret;
if (!get_args(argc, argv)) {
bu_exit(1, "%s", usage);
@@ -200,8 +210,12 @@
for (row = 0 + yorig; row < ynum + yorig; row++) {
offset = (row * linelen + xorig) * bytes_per_pixel;
fseek(ifp, offset, 0);
- fread(buf, sizeof(*buf), outbytes, ifp);
- fwrite(buf, sizeof(*buf), outbytes, ofp);
+ ret = fread(buf, sizeof(*buf), outbytes, ifp);
+ if (ret < (size_t)outbytes)
+ perror("fread");
+ ret = fwrite(buf, sizeof(*buf), outbytes, ofp);
+ if (ret < (size_t)outbytes)
+ perror("fwrite");
}
return 0;
Modified: brlcad/trunk/src/util/pixscale.c
===================================================================
--- brlcad/trunk/src/util/pixscale.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixscale.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -80,6 +80,7 @@
fill_buffer(int y)
{
static int file_pos = 0;
+ size_t ret;
buf_start = y - buflines/2;
if (buf_start < 0) buf_start = 0;
@@ -90,7 +91,10 @@
}
file_pos = buf_start * scanlen;
}
- fread(buffer, scanlen, buflines, buffp);
+ ret = fread(buffer, scanlen, buflines, buffp);
+ if (ret < (size_t)buflines)
+ perror("fread");
+
file_pos += buflines * scanlen;
}
@@ -107,6 +111,7 @@
double x, y;
double xstep, ystep;
unsigned char *op, *lp;
+ size_t ret;
xstep = (double)(ix - 1) / (double)ox - 1.0e-6;
ystep = (double)(iy - 1) / (double)oy - 1.0e-6;
@@ -134,7 +139,9 @@
*op++ = lp[2];
}
- (void) fwrite(outbuf, 3, ox, ofp);
+ ret = fwrite(outbuf, 3, ox, ofp);
+ if (ret < (size_t)ox)
+ perror("fwrite");
}
}
@@ -151,6 +158,7 @@
double x, y, dx, dy, mid1, mid2;
double xstep, ystep;
unsigned char *op, *up, *lp;
+ size_t ret;
xstep = (double)(ix - 1) / (double)ox - 1.0e-6;
ystep = (double)(iy - 1) / (double)oy - 1.0e-6;
@@ -198,7 +206,9 @@
*op++ = mid1 + dy * (mid2 - mid1);
}
- (void) fwrite(outbuf, 3, ox, ofp);
+ ret = fwrite(outbuf, 3, ox, ofp);
+ if (ret < (size_t)ox)
+ perror("fwrite");
}
}
@@ -219,6 +229,7 @@
double xdist, ydist; /* length of new pixel sides in
old coord */
double sumr, sumg, sumb;
unsigned char *op;
+ size_t ret;
if (ix == ox)
pxlen = 1.0;
@@ -289,7 +300,9 @@
*op++ = (int)(sumg / (pxlen * pylen));
*op++ = (int)(sumb / (pxlen * pylen));
}
- fwrite(outbuf, 3, ox, ofp);
+ ret = fwrite(outbuf, 3, ox, ofp);
+ if (ret < (size_t)ox)
+ perror("fwrite");
}
return 1;
}
Modified: brlcad/trunk/src/util/pixsubst.c
===================================================================
--- brlcad/trunk/src/util/pixsubst.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixsubst.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -36,6 +36,7 @@
unsigned char pix[3], pixin[3], pixout[3];
int npixels;
+ size_t ret;
if (argc != 4 && argc != 7) {
bu_log("Usage:\n");
@@ -65,14 +66,21 @@
if ((npixels=fread(pixin, sizeof(unsigned char), 3, stdin)) != 3) {
bu_exit(1, "Unexpected end of input\n");
}
- fwrite(pixout, sizeof(unsigned char), npixels, stdout);
+ ret = fwrite(pixout, sizeof(unsigned char), npixels, stdout);
+ if (ret < (size_t)npixels)
+ perror("fwrite");
}
while ((npixels=fread(pix, sizeof(unsigned char), 3, stdin)) == 3) {
- if (pix[0] == pixin[0] && pix[1] == pixin[1] && pix[2] == pixin[2])
- fwrite(pixout, sizeof(unsigned char), npixels, stdout);
- else
- fwrite(pix, sizeof(unsigned char), npixels, stdout);
+ if (pix[0] == pixin[0] && pix[1] == pixin[1] && pix[2] == pixin[2]) {
+ ret = fwrite(pixout, sizeof(unsigned char), npixels, stdout);
+ if (ret < (size_t)npixels)
+ perror("fwrite");
+ } else {
+ ret = fwrite(pix, sizeof(unsigned char), npixels, stdout);
+ if (ret < (size_t)npixels)
+ perror("fwrite");
+ }
}
return 0;
}
Modified: brlcad/trunk/src/util/pixtile.c
===================================================================
--- brlcad/trunk/src/util/pixtile.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixtile.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -116,6 +116,7 @@
int islist = 0; /* set if a list, zero if basename */
int is_stream = 0; /* set if input is stream on stdin */
char name[256] = {0};
+ ssize_t ret;
if (!get_args(argc, argv)) {
(void)fputs(usage, stderr);
@@ -202,13 +203,20 @@
}
if (fd > 0) close(fd);
}
- (void)write(1, obuf, swathbytes);
+ ret = write(1, obuf, swathbytes);
+ if (ret < 0)
+ perror("write");
+
rel = 0; /* in case we fall through */
}
done:
/* Flush partial frame? */
- if (rel != 0)
- (void)write(1, obuf, swathbytes);
+ if (rel != 0) {
+ ret = write(1, obuf, swathbytes);
+ if (ret < 0)
+ perror("write");
+ }
+
fprintf(stderr, "\n");
return 0;
Modified: brlcad/trunk/src/util/pixuntile.c
===================================================================
--- brlcad/trunk/src/util/pixuntile.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pixuntile.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -109,6 +109,7 @@
char ibuf[1024*3] = {0};
char name[80] = {0};
FILE *f[8];
+ size_t ret;
if (!get_args(argc, argv)) {
(void)fputs(usage, stderr);
@@ -155,7 +156,9 @@
}
/* split this scanline up into the output files */
for (i = 0; i < numx; i++) {
- fwrite(&ibuf[i*out_width*pixsize], pixsize, out_width, f[i]);
+ ret = fwrite(&ibuf[i*out_width*pixsize], pixsize, out_width, f[i]);
+ if (ret < out_width)
+ perror("fwrite");
}
y = (y + 1) % out_height;
}
Modified: brlcad/trunk/src/util/pl-asc.c
===================================================================
--- brlcad/trunk/src/util/pl-asc.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pl-asc.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -264,8 +264,12 @@
int i;
char in[8*16];
double out[16];
+ size_t ret;
- fread(in, 8, n, fp);
+ ret = fread(in, 8, n, fp);
+ if (ret < (size_t)n)
+ perror("fread");
+
ntohd((unsigned char *)out, (unsigned char *)in, n);
for (i = 0; i < n; i++) {
Modified: brlcad/trunk/src/util/pl-pl.c
===================================================================
--- brlcad/trunk/src/util/pl-pl.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pl-pl.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -377,8 +377,12 @@
{
char in[8];
double d;
+ size_t ret;
- fread(in, 8, 1, stdin);
+ ret = fread(in, 8, 1, stdin);
+ if (ret < 1)
+ perror("fread");
+
ntohd((unsigned char *)&d, (unsigned char *)in, 1);
return d;
}
@@ -481,9 +485,12 @@
putieee(double d)
{
unsigned char out[8];
+ size_t ret;
htond(out, (unsigned char *)&d, 1);
- fwrite(out, 1, 8, stdout);
+ ret = fwrite(out, 1, 8, stdout);
+ if (ret < 8)
+ perror("fwrite");
}
Modified: brlcad/trunk/src/util/pl-ps.c
===================================================================
--- brlcad/trunk/src/util/pl-ps.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pl-ps.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -169,8 +169,12 @@
{
unsigned char in[8];
double d;
+ size_t ret;
- fread(in, 8, 1, infp);
+ ret = fread(in, 8, 1, infp);
+ if (ret < 1)
+ perror("fread");
+
ntohd((unsigned char *)&d, in, 1);
return d;
}
Modified: brlcad/trunk/src/util/pl-tek.c
===================================================================
--- brlcad/trunk/src/util/pl-tek.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pl-tek.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -170,8 +170,12 @@
{
unsigned char in[8];
double d;
+ size_t ret;
- fread(in, 8, 1, stdin);
+ ret = fread(in, 8, 1, stdin);
+ if (ret < 1)
+ perror("fread");
+
ntohd((unsigned char *)&d, in, 1);
return d;
}
Modified: brlcad/trunk/src/util/pldebug.c
===================================================================
--- brlcad/trunk/src/util/pldebug.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/pldebug.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -190,8 +190,12 @@
int i;
unsigned char in[8*16];
double out[16];
+ size_t ret;
- fread(in, 8, n, fp);
+ ret = fread(in, 8, n, fp);
+ if (ret < (size_t)n)
+ perror("fread");
+
ntohd((unsigned char *)out, in, n);
putchar('(');
Modified: brlcad/trunk/src/util/plrot.c
===================================================================
--- brlcad/trunk/src/util/plrot.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/plrot.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -37,8 +37,8 @@
#include "bn.h"
#define UPPER_CASE(c) ((c)-32)
-#define COPY(n) {fread(cbuf, 1, n, fp); fwrite(cbuf, 1, n, stdout);}
-#define SKIP(n) {fread(cbuf, 1, n, fp);}
+#define COPY(n) {size_t ret; ret = fread(cbuf, 1, n, fp); if (ret < n)
perror("fread"); ret = fwrite(cbuf, 1, n, stdout); if (ret < n)
perror("fwrite");}
+#define SKIP(n) {size_t ret; ret = fread(cbuf, 1, n, fp); if (ret < n)
perror("fread");}
#define LEN 265
#define putsi(s) {putchar(s); putchar((s)>>8);}
@@ -594,15 +594,21 @@
unsigned char buf[2*8];
double p1[3];
double p2[3];
+ size_t ret;
- fread(buf, 1, 2*8, fp);
+ ret = fread(buf, 1, 2*8, fp);
+ if (ret < 2*8)
+ perror("fread");
+
ntohd((unsigned char *)p1, buf, 2);
p1[2] = 0; /* no Z */
MAT4X3PNT(p2, m, p1);
htond(buf, (unsigned char *)p2, 3);
- fwrite(buf, 1, 3*8, stdout);
+ ret = fwrite(buf, 1, 3*8, stdout);
+ if (ret < 3*8)
+ perror("fwrite");
}
@@ -612,14 +618,20 @@
unsigned char buf[3*8];
double p1[3];
double p2[3];
+ size_t ret;
- fread(buf, 1, 3*8, fp);
+ ret = fread(buf, 1, 3*8, fp);
+ if (ret < 3*8)
+ perror("fread");
+
ntohd((unsigned char *)p1, buf, 3);
MAT4X3PNT(p2, m, p1);
htond(buf, (unsigned char *)p2, 3);
- fwrite(buf, 1, 3*8, stdout);
+ ret = fwrite(buf, 1, 3*8, stdout);
+ if (ret < 3*8)
+ perror("fwrite");
}
@@ -628,7 +640,12 @@
{
double d;
unsigned char buf[8];
- fread(buf, 8, 1, fp);
+ size_t ret;
+
+ ret = fread(buf, 8, 1, fp);
+ if (ret < 1)
+ perror("fread");
+
ntohd((unsigned char *)&d, buf, 1);
return d;
}
Modified: brlcad/trunk/src/util/plstat.c
===================================================================
--- brlcad/trunk/src/util/plstat.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/plstat.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -253,8 +253,12 @@
int i;
unsigned char in[8*16];
double out[16];
+ size_t ret;
- fread(in, 8, n, fp);
+ ret = fread(in, 8, n, fp);
+ if (ret < (size_t)n)
+ perror("fread");
+
ntohd((unsigned char *)out, in, n);
for (i = 0; i < n; i++) {
Modified: brlcad/trunk/src/util/png-bw.c
===================================================================
--- brlcad/trunk/src/util/png-bw.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/png-bw.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -70,6 +70,7 @@
int num;
int in, out;
double value;
+ size_t ret;
while (argc > 1 && argv[1][0] == '-') {
if (strcmp(argv[1], "-v") == 0)
@@ -229,7 +230,9 @@
png_read_image(png_p, rows);
if (!convert_to_bw) {
- fwrite(image, file_width*file_height, 1, stdout);
+ ret = fwrite(image, file_width*file_height, 1, stdout);
+ if (ret < 1)
+ perror("fwrite");
bu_exit (0, NULL);
}
@@ -285,7 +288,9 @@
(int)image[in+2]) / 3;
}
- fwrite(obuf, sizeof(char), num/3, stdout);
+ ret = fwrite(obuf, sizeof(char), num/3, stdout);
+ if (ret < (size_t)num/3)
+ perror("fwrite");
if (clip_high != 0 || clip_low != 0) {
fprintf(stderr, "png-bw: clipped %d high, %d, low\n",
Modified: brlcad/trunk/src/util/png-pix.c
===================================================================
--- brlcad/trunk/src/util/png-pix.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/png-pix.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -57,6 +57,7 @@
int file_width, file_height;
unsigned char *image;
unsigned char **rows;
+ size_t ret;
while ((c=bu_getopt(argc, argv, "v")) != EOF) {
switch (c) {
@@ -181,7 +182,9 @@
png_read_image(png_p, rows);
- fwrite(image, file_width*file_height*3, 1, stdout);
+ ret = fwrite(image, file_width*file_height*3, 1, stdout);
+ if (ret < 1)
+ perror("fwrite");
if (verbose) {
png_timep mod_time;
Modified: brlcad/trunk/src/util/sun-pix.c
===================================================================
--- brlcad/trunk/src/util/sun-pix.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/sun-pix.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -259,8 +259,11 @@
if (!pure) {
long nbits;
+ size_t ret;
- fread(inbuf, sizeof(struct rasterfile), 1, fp);
+ ret = fread(inbuf, sizeof(struct rasterfile), 1, fp);
+ if (ret < 1)
+ perror("fread");
header.ras_magic = getlong(&inbuf[NET_LONG_LEN*0]);
header.ras_width = getlong(&inbuf[NET_LONG_LEN*1]);
Modified: brlcad/trunk/src/util/terrain.c
===================================================================
--- brlcad/trunk/src/util/terrain.c 2011-01-13 05:09:33 UTC (rev 42213)
+++ brlcad/trunk/src/util/terrain.c 2011-01-13 05:38:03 UTC (rev 42214)
@@ -657,6 +657,7 @@
unsigned short *buf;
int in_cookie, out_cookie;
int count;
+ size_t ret;
arg_count = parse_args(ac, av);
@@ -691,7 +692,10 @@
}
}
- fwrite(buf, sizeof(*buf), count, stdout);
+ ret = fwrite(buf, sizeof(*buf), count, stdout);
+ if (ret < (size_t)count)
+ perror("fwrite");
+
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
