Revision: 42209
http://brlcad.svn.sourceforge.net/brlcad/?rev=42209&view=rev
Author: brlcad
Date: 2011-01-13 05:06:30 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
fix a slew of warnings from erik's linux build log. don't ignore the return
values from fread/fwrite/read/write/scanf.
Modified Paths:
--------------
brlcad/trunk/src/util/bwrot.c
brlcad/trunk/src/util/bwscale.c
brlcad/trunk/src/util/dsp_add.c
brlcad/trunk/src/util/dunncomm.c
brlcad/trunk/src/util/dunnsnap.c
brlcad/trunk/src/util/fix_polysolids.c
Modified: brlcad/trunk/src/util/bwrot.c
===================================================================
--- brlcad/trunk/src/util/bwrot.c 2011-01-13 05:04:41 UTC (rev 42208)
+++ brlcad/trunk/src/util/bwrot.c 2011-01-13 05:06:30 UTC (rev 42209)
@@ -294,6 +294,7 @@
unsigned char *obuf;
unsigned char *buffer;
double angle = 0.0;
+ size_t io;
ifp = stdin;
ofp = stdout;
@@ -357,7 +358,9 @@
}
outplace = outbyte;
}
- fwrite(obuf, pixbytes, buflines, ofp);
+ io = fwrite(obuf, pixbytes, buflines, ofp);
+ if (io < buflines)
+ perror("fwrite");
outplace += buflines*pixbytes;
}
} else if (minus90) {
@@ -381,7 +384,9 @@
}
outplace = outbyte;
}
- fwrite(obuf, pixbytes, buflines, ofp);
+ io = fwrite(obuf, pixbytes, buflines, ofp);
+ if (io < buflines)
+ perror("fwrite");
outplace += buflines*pixbytes;
}
} else if (invert) {
@@ -397,13 +402,17 @@
}
outplace = outbyte;
}
- fwrite(&buffer[(y-firsty-1)*scanbytes], 1, scanbytes, ofp);
+ io = fwrite(&buffer[(y-firsty-1)*scanbytes], 1, scanbytes, ofp);
+ if (io < scanbytes)
+ perror("fwrite");
outplace += scanbytes;
}
} else {
/* Reverse only */
for (y = 0; y < buflines; y++) {
- fwrite(&buffer[y*scanbytes], 1, scanbytes, ofp);
+ io = fwrite(&buffer[y*scanbytes], 1, scanbytes, ofp);
+ if (io < scanbytes)
+ perror("fwrite");
}
}
Modified: brlcad/trunk/src/util/bwscale.c
===================================================================
--- brlcad/trunk/src/util/bwscale.c 2011-01-13 05:04:41 UTC (rev 42208)
+++ brlcad/trunk/src/util/bwscale.c 2011-01-13 05:06:30 UTC (rev 42209)
@@ -160,6 +160,7 @@
static void
fill_buffer(int y)
{
+ size_t ret;
buf_start = y - buflines/2;
if (buf_start < 0) buf_start = 0;
@@ -167,7 +168,9 @@
fprintf(stderr, "bwscale: Can't seek to input pixel!\n");
/* bu_exit (3, NULL); */
}
- fread(buffer, scanlen, buflines, buffp);
+ ret = fread(buffer, scanlen, buflines, buffp);
+ if (ret != (size_t)buflines)
+ perror("fread");
}
@@ -215,6 +218,7 @@
/* For each output pixel */
for (j = 0; j < oy; j++) {
+ size_t ret;
y = j * ystep;
/*
* Make sure we have this row (and the one after it)
@@ -244,7 +248,9 @@
*op++ = mid1 + dy * (mid2 - mid1);
}
- (void) fwrite(outbuf, 1, ox, ofp);
+ ret = fwrite(outbuf, 1, ox, ofp);
+ if (ret != (size_t)ox)
+ perror("fwrite");
}
}
@@ -261,6 +267,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;
@@ -286,7 +293,9 @@
*op++ = lp[0];
}
- (void) fwrite(outbuf, 1, ox, ofp);
+ ret = fwrite(outbuf, 1, ox, ofp);
+ if (ret != (size_t)ox)
+ perror("fwrite");
}
}
@@ -328,6 +337,8 @@
/* for each output pixel */
for (j = 0; j < oy; j++) {
+ size_t ret;
+
ystart = j * pylen;
yend = ystart + pylen;
op = outbuf;
@@ -370,7 +381,9 @@
if (op > (outbuf+scanlen))
abort();
}
- (void) fwrite(outbuf, 1, ox, ofp);
+ ret = fwrite(outbuf, 1, ox, ofp);
+ if (ret != (size_t)ox)
+ perror("fwrite");
}
return 1;
}
Modified: brlcad/trunk/src/util/dsp_add.c
===================================================================
--- brlcad/trunk/src/util/dsp_add.c 2011-01-13 05:04:41 UTC (rev 42208)
+++ brlcad/trunk/src/util/dsp_add.c 2011-01-13 05:06:30 UTC (rev 42209)
@@ -179,6 +179,7 @@
int in_cookie, out_cookie;
int conv;
struct stat sb;
+ size_t ret;
next_arg = parse_args(ac, av);
@@ -214,10 +215,14 @@
count = count >> 1; /* convert count of char to count of short */
/* Read the terrain data */
- fread(buf1, sizeof(short), count, in1);
+ ret = fread(buf1, sizeof(short), count, in1);
+ if (ret < count)
+ perror("fread");
fclose(in1);
- fread(buf2, sizeof(short), count, in2);
+ ret = fread(buf2, sizeof(short), count, in2);
+ if (ret < count)
+ perror("fread");
fclose(in2);
Modified: brlcad/trunk/src/util/dunncomm.c
===================================================================
--- brlcad/trunk/src/util/dunncomm.c 2011-01-13 05:04:41 UTC (rev 42208)
+++ brlcad/trunk/src/util/dunncomm.c 2011-01-13 05:06:30 UTC (rev 42209)
@@ -188,6 +188,7 @@
int
goodstatus(void)
{
+ ssize_t ret;
struct timeval waittime, *timeout;
int readval;
@@ -196,7 +197,9 @@
timeout->tv_usec = 0;
cmd = ';'; /* status request cmd */
- write(fd, &cmd, 1);
+ ret = write(fd, &cmd, 1);
+ if (ret < 0)
+ perror("write");
FD_ZERO(&readfds);
FD_SET(fd, &readfds);
select(fd+1, &readfds, (fd_set *)0, (fd_set *)0, timeout);
@@ -259,6 +262,7 @@
ready(int nsecs)
{
int i;
+ ssize_t ret;
struct timeval waittime, *timeout;
timeout = &waittime;
@@ -266,7 +270,9 @@
timeout->tv_usec = 0;
cmd = ':'; /* ready test command */
- write(fd, &cmd, 1);
+ ret = write(fd, &cmd, 1);
+ if (ret < 0)
+ perror("write");
FD_ZERO(&readfds);
FD_SET(fd, &readfds);
@@ -319,6 +325,7 @@
{
struct timeval waittime;
int readval;
+ ssize_t ret;
waittime.tv_sec = 20;
waittime.tv_usec = 0;
@@ -331,7 +338,10 @@
cmd = '<'; /* req 8x10 exposure values */
else
cmd = '='; /* request AUX exposure values */
- write(fd, &cmd, 1);
+ ret = write(fd, &cmd, 1);
+ if (ret < 0)
+ perror("write");
+
FD_ZERO(&readfds);
FD_SET(fd, &readfds);
select(fd+1, &readfds, (fd_set *)0, (fd_set *)0, &waittime);
@@ -357,6 +367,7 @@
dunnsend(char color, int val)
{
char digit;
+ ssize_t ret;
if (val < 0 || val > 255) {
printf("dunncolor: bad value %d\n", val);
@@ -372,19 +383,34 @@
cmd = 'K'; /* set 8x10 exposure values */
else
cmd = 'L'; /* set AUX exposure values */
- write(fd, &cmd, 1);
+ ret = write(fd, &cmd, 1);
+ if (ret < 0)
+ perror("write");
+
hangten();
- write(fd, &color, 1);
+ ret = write(fd, &color, 1);
+ if (ret < 0)
+ perror("write");
+
hangten();
digit = (val/100 + 0x30)&0x7f;
- write(fd, &digit, 1);
+ ret = write(fd, &digit, 1);
+ if (ret < 0)
+ perror("write");
+
hangten();
val = val%100;
digit = (val/10 + 0x30)&0x7f;
- write(fd, &digit, 1);
+ ret = write(fd, &digit, 1);
+ if (ret < 0)
+ perror("write");
+
hangten();
digit = (val%10 + 0x30)&0x7f;
- write(fd, &digit, 1);
+ ret = write(fd, &digit, 1);
+ if (ret < 0)
+ perror("write");
+
hangten();
return 0; /* OK */
}
Modified: brlcad/trunk/src/util/dunnsnap.c
===================================================================
--- brlcad/trunk/src/util/dunnsnap.c 2011-01-13 05:04:41 UTC (rev 42208)
+++ brlcad/trunk/src/util/dunnsnap.c 2011-01-13 05:06:30 UTC (rev 42209)
@@ -101,6 +101,7 @@
int
main(int argc, char **argv)
{
+ ssize_t ret;
FBIO *fbp = FBIO_NULL;
if (!get_args(argc, argv)) {
@@ -144,7 +145,9 @@
/* send expose command to camera */
cmd = 'I'; /* expose command */
- write(fd, &cmd, 1);
+ ret = write(fd, &cmd, 1);
+ if (ret < 0)
+ perror("write");
hangten();
/* Wait a long time here, because exposure can be lengthy */
Modified: brlcad/trunk/src/util/fix_polysolids.c
===================================================================
--- brlcad/trunk/src/util/fix_polysolids.c 2011-01-13 05:04:41 UTC (rev
42208)
+++ brlcad/trunk/src/util/fix_polysolids.c 2011-01-13 05:06:30 UTC (rev
42209)
@@ -97,6 +97,7 @@
struct vertex *verts[5];
union record rec2;
int i;
+ size_t ret;
if (done == 2) {
rec = rec2;
@@ -155,7 +156,9 @@
break;
default:
- fwrite(&rec, sizeof(union record), 1, stdout);
+ ret = fwrite(&rec, sizeof(union record), 1, stdout);
+ if (ret < 1)
+ perror("fwrite");
break;
}
}
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
