summaryrefslogtreecommitdiffstats
path: root/usr.bin/compress/zopen.c
diff options
context:
space:
mode:
authorarchie <archie@FreeBSD.org>1998-12-06 22:58:23 +0000
committerarchie <archie@FreeBSD.org>1998-12-06 22:58:23 +0000
commit167c036e91fb24a62d627d16a2f3afa6d875c9e2 (patch)
treee40a696092a51458b052ff258b3700d51fc2ca09 /usr.bin/compress/zopen.c
parent3f56407712318be6faa0b98ad8db4b5a83ef4c93 (diff)
downloadFreeBSD-src-167c036e91fb24a62d627d16a2f3afa6d875c9e2.zip
FreeBSD-src-167c036e91fb24a62d627d16a2f3afa6d875c9e2.tar.gz
Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]).
Diffstat (limited to 'usr.bin/compress/zopen.c')
-rw-r--r--usr.bin/compress/zopen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 5e5357b..abe31f2 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -388,7 +388,7 @@ output(zs, ocode)
* Since ocode is always >= 8 bits, only need to mask the first
* hunk on the left.
*/
- *bp = (*bp & rmask[r_off]) | (ocode << r_off) & lmask[r_off];
+ *bp = (*bp & rmask[r_off]) | ((ocode << r_off) & lmask[r_off]);
bp++;
bits -= (8 - r_off);
ocode >>= 8 - r_off;
@@ -698,7 +698,7 @@ zopen(fname, mode, bits)
{
struct s_zstate *zs;
- if (mode[0] != 'r' && mode[0] != 'w' || mode[1] != '\0' ||
+ if ((mode[0] != 'r' && mode[0] != 'w') || mode[1] != '\0' ||
bits < 0 || bits > BITS) {
errno = EINVAL;
return (NULL);
@@ -738,4 +738,5 @@ zopen(fname, mode, bits)
return (funopen(zs, NULL, zwrite, NULL, zclose));
}
/* NOTREACHED */
+ return (NULL);
}
OpenPOWER on IntegriCloud