diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-05-15 23:00:11 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-05-15 23:00:11 +0100 |
| commit | 5ee6ac27d4fd4c9412183aa8cc1143f36ae04a8c (patch) | |
| tree | 6dd09ce00ac49708866b4a18423cb0a503cbc6fb /usr/src/ucblib/libucb/port | |
| parent | deef35fd18fdfb1c42002a4793ebb2c181b08680 (diff) | |
| download | illumos-joyent-5ee6ac27d4fd4c9412183aa8cc1143f36ae04a8c.tar.gz | |
1712 remove uses of CPP assertions in conditionals
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/ucblib/libucb/port')
| -rw-r--r-- | usr/src/ucblib/libucb/port/gen/setbuffer.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/usr/src/ucblib/libucb/port/gen/setbuffer.c b/usr/src/ucblib/libucb/port/gen/setbuffer.c index 47aa76f88b..8eeea0179b 100644 --- a/usr/src/ucblib/libucb/port/gen/setbuffer.c +++ b/usr/src/ucblib/libucb/port/gen/setbuffer.c @@ -36,8 +36,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /*LINTLIBRARY*/ #include <sys/types.h> @@ -61,14 +59,11 @@ setbuffer(FILE *iop, char *abuf, int asize) iop->_flag &= ~(_IOMYBUF | _IONBF | _IOLBF); if (buf == 0) { iop->_flag |= _IONBF; -#ifndef _STDIO_ALLOCATE if (fno < 2) { /* use special buffer for std{in,out} */ buf = (fno == 0) ? _sibuf : _sobuf; size = BUFSIZ - _SMBFSZ; - } else /* needed for ifdef */ -#endif - if (fno < _NFILE) { + } else if (fno < _NFILE) { buf = _smbuf[fno]; size = _SMBFSZ - PUSHBACK; } else if ((buf = (Uchar *)malloc(_SMBFSZ * sizeof (Uchar))) != |