[brlcad-commits] SF.net SVN: brlcad:[36664] brlcad/trunk/src/libpkg/pkg.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2009-11-25 23:16:29
|
Revision: 36664 http://brlcad.svn.sourceforge.net/brlcad/?rev=36664&view=rev Author: brlcad Date: 2009-11-25 23:16:18 +0000 (Wed, 25 Nov 2009) Log Message: ----------- quell a handful of verbose/c99-strict compilation warnings including avoiding fileno(), skipping the superset isascii() test used with isprint(), and avoiding using caddr_t (tested on linux and mac to just cast to void* instead) Modified Paths: -------------- brlcad/trunk/src/libpkg/pkg.c Modified: brlcad/trunk/src/libpkg/pkg.c =================================================================== --- brlcad/trunk/src/libpkg/pkg.c 2009-11-25 23:09:51 UTC (rev 36663) +++ brlcad/trunk/src/libpkg/pkg.c 2009-11-25 23:16:18 UTC (rev 36664) @@ -488,6 +488,8 @@ struct pkg_conn * pkg_transerver(const struct pkg_switch *switchp, void (*errlog)(char *)) { + struct pkg_conn *conn; + _pkg_ck_debug(); if (_pkg_debug) { _pkg_timestamp(); @@ -501,7 +503,8 @@ * XXX - Somehow the system has to know what connection was * accepted, it's protocol, etc. For UNIX/inetd we use stdin. */ - return(_pkg_makeconn(fileno(stdin), switchp, errlog)); + conn = _pkg_makeconn(STDIN_FILENO, switchp, errlog); + return(conn); } @@ -957,9 +960,9 @@ pkg_plong((char *)hdr.pkh_len, (unsigned long)len); #ifdef HAVE_WRITEV - cmdvec[0].iov_base = (caddr_t)&hdr; + cmdvec[0].iov_base = (void *)&hdr; cmdvec[0].iov_len = sizeof(hdr); - cmdvec[1].iov_base = (caddr_t)buf; + cmdvec[1].iov_base = (void *)buf; cmdvec[1].iov_len = len; /* @@ -1065,11 +1068,11 @@ pkg_plong((char *)hdr.pkh_len, (unsigned long)(len1+len2)); #ifdef HAVE_WRITEV - cmdvec[0].iov_base = (caddr_t)&hdr; + cmdvec[0].iov_base = (void *)&hdr; cmdvec[0].iov_len = sizeof(hdr); - cmdvec[1].iov_base = (caddr_t)buf1; + cmdvec[1].iov_base = (void *)buf1; cmdvec[1].iov_len = len1; - cmdvec[2].iov_base = (caddr_t)buf2; + cmdvec[2].iov_base = (void *)buf2; cmdvec[2].iov_len = len2; /* @@ -1272,7 +1275,7 @@ while (pkg_gshort((char *)pc->pkc_hdr.pkh_magic) != PKG_MAGIC) { int c; c = *((unsigned char *)&pc->pkc_hdr); - if (isascii(c) && isprint(c)) { + if (isprint(c)) { snprintf(_pkg_errbuf, MAX_PKG_ERRBUF_SIZE, "_pkg_gethdr: skipping noise x%x %c\n", c, c); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |