[brlcad-commits] SF.net SVN: brlcad:[48934] brlcad/trunk/src/conv/asc/pix2asc.c

[<br...@us...>]

Revision: 48934
          http://brlcad.svn.sourceforge.net/brlcad/?rev=48934&view=rev
Author:   brlcad
Date:     2012-01-20 05:34:36 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
revert r48777 that maybe quelled a TAINTED_SCALAR coverity warning since it causes a compilation warning (it's always true).  cleanup.

Revision Links:
--------------
    http://brlcad.svn.sourceforge.net/brlcad/?rev=48777&view=rev

Modified Paths:
--------------
    brlcad/trunk/src/conv/asc/pix2asc.c

Modified: brlcad/trunk/src/conv/asc/pix2asc.c
===================================================================
--- brlcad/trunk/src/conv/asc/pix2asc.c	2012-01-20 03:41:00 UTC (rev 48933)
+++ brlcad/trunk/src/conv/asc/pix2asc.c	2012-01-20 05:34:36 UTC (rev 48934)
@@ -18,12 +18,6 @@
  * information.
  *
  */
-/** @file pix2asc.c
- *
- *  Author -
- *  	Michael John Muuss
- *
- */
 
 #include "common.h"
 
@@ -36,18 +30,17 @@
 
 unsigned char pix[3];		/* RGB of one pixel */
 
-char map[18] = "0123456789ABCDEFx";
+unsigned char map[18] = "0123456789ABCDEFx";
 
 int
-main(void)
+main(int UNUSED(ac), char **UNUSED(argv))
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     setmode(fileno(stdin), O_BINARY);
     setmode(fileno(stdout), O_BINARY);
 #endif
     while ( !feof(stdin) &&
-	fread( (char *)pix, sizeof(pix), 1, stdin) == 1 )  {
-      if (pix[0] <= CHAR_MAX && pix[1] <= CHAR_MAX && pix[2] <= CHAR_MAX) {
+	    fread( (void *)pix, sizeof(unsigned char) * 3, 1, stdin) == 1 )  {
 	putc( map[pix[0]>>4], stdout );
 	putc( map[pix[0]&0xF], stdout );
 	putc( map[pix[1]>>4], stdout );
@@ -55,9 +48,6 @@
 	putc( map[pix[2]>>4], stdout );
 	putc( map[pix[2]&0xF], stdout );
 	putc( '\n', stdout );
-      } else {
-	bu_log("Invalid char!\n");
-      }
     }
     return 0;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.