From aa4b5ff0763512d4e2fef7a90b78b9fea3b0f52f Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 8 Aug 2020 19:39:48 -0700
Subject: [PATCH] suppress -Wconversion warnings from int promotion due to ~ of
 flags

Squashes 11 warnings.
---
 lib/sfio/sfclrlock.c | 2 +-
 lib/sfio/sfexcept.c  | 2 +-
 lib/sfio/sfnew.c     | 2 +-
 lib/sfio/sfopen.c    | 2 +-
 lib/sfio/sfrd.c      | 4 ++--
 lib/sfio/sfseek.c    | 2 +-
 lib/sfio/sfset.c     | 4 ++--
 lib/sfio/sfsetbuf.c  | 2 +-
 lib/sfio/sfswap.c    | 4 ++--
 lib/sfio/sfwr.c      | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/sfio/sfclrlock.c b/lib/sfio/sfclrlock.c
index ca98fe9f9..ad25ee486 100644
--- a/lib/sfio/sfclrlock.c
+++ b/lib/sfio/sfclrlock.c
@@ -30,7 +30,7 @@ int sfclrlock(reg Sfio_t * f)
     SFMTXSTART(f, 0);
 
     /* clear error bits */
-    f->flags &= ~(SF_ERROR | SF_EOF);
+    f->flags &= (unsigned short)~(SF_ERROR | SF_EOF);
 
     /* clear peek locks */
     if (f->mode & SF_PKRD) {
diff --git a/lib/sfio/sfexcept.c b/lib/sfio/sfexcept.c
index 57d0206c4..5964393ed 100644
--- a/lib/sfio/sfexcept.c
+++ b/lib/sfio/sfexcept.c
@@ -91,7 +91,7 @@ int _sfexcept(Sfio_t * f, int type, ssize_t io, Sfdisc_t * disc)
 
 	/* a normal interrupt, we can continue */
 	errno = 0;
-	f->flags &= ~(SF_EOF | SF_ERROR);
+	f->flags &= (unsigned short)~(SF_EOF | SF_ERROR);
 	SFMTXRETURN(f, SF_ECONT);
     }
 
diff --git a/lib/sfio/sfnew.c b/lib/sfio/sfnew.c
index f73c93b05..6b2628b7f 100644
--- a/lib/sfio/sfnew.c
+++ b/lib/sfio/sfnew.c
@@ -64,7 +64,7 @@ Sfio_t *sfnew(Sfio_t * oldf, void * buf, size_t size, int file,
 		f->data = NIL(uchar *);
 	    }
 	    if (!f->data)
-		sflags &= ~SF_MALLOC;
+		sflags &= (unsigned short)~SF_MALLOC;
 	}
     }
 
diff --git a/lib/sfio/sfopen.c b/lib/sfio/sfopen.c
index ee22c7aa7..70b2f9db6 100644
--- a/lib/sfio/sfopen.c
+++ b/lib/sfio/sfopen.c
@@ -170,7 +170,7 @@ int _sftype(reg const char *mode, int *oflagsp, int *uflagp)
 	    uflag = 0;
 	    continue;
 	case 'u':
-	    sflags &= ~SF_MTSAFE;
+	    sflags &= (unsigned short)~SF_MTSAFE;
 	    uflag = 1;
 	    continue;
 	default:
diff --git a/lib/sfio/sfrd.c b/lib/sfio/sfrd.c
index 2079c1660..c68be86d2 100644
--- a/lib/sfio/sfrd.c
+++ b/lib/sfio/sfrd.c
@@ -78,7 +78,7 @@ ssize_t sfrd(reg Sfio_t * f, reg void * buf, reg size_t n,
 	if (!(f->flags & SF_STRING) && f->file < 0)
 	    SFMTXRETURN(f, 0);
 
-	f->flags &= ~(SF_EOF | SF_ERROR);
+	f->flags &= (unsigned short)~(SF_EOF | SF_ERROR);
 
 	dc = disc;
 	if (f->flags & SF_STRING) {
@@ -127,7 +127,7 @@ ssize_t sfrd(reg Sfio_t * f, reg void * buf, reg size_t n,
 		f->mode |= rcrv;
 	    /* tell readf that no peeking necessary */
 	    else
-		f->flags &= ~SF_SHARE;
+		f->flags &= (unsigned short)~SF_SHARE;
 
 	    SFDCRD(f, buf, n, dc, r);
 
diff --git a/lib/sfio/sfseek.c b/lib/sfio/sfseek.c
index 6cbbef96c..dceb990fc 100644
--- a/lib/sfio/sfseek.c
+++ b/lib/sfio/sfseek.c
@@ -87,7 +87,7 @@ Sfoff_t sfseek(Sfio_t * f, Sfoff_t p, int type)
     SFLOCK(f, local);
 
     /* clear error and eof bits */
-    f->flags &= ~(SF_EOF | SF_ERROR);
+    f->flags &= (unsigned short)~(SF_EOF | SF_ERROR);
 
     while (f->flags & SF_STRING) {
 	SFSTRSIZE(f);
diff --git a/lib/sfio/sfset.c b/lib/sfio/sfset.c
index 91e75efc3..c954696d0 100644
--- a/lib/sfio/sfset.c
+++ b/lib/sfio/sfset.c
@@ -45,7 +45,7 @@ int sfset(reg Sfio_t * f, reg int flags, reg int set)
     if (set)
 	f->flags |= (flags & SF_SETS);
     else
-	f->flags &= ~(flags & SF_SETS);
+	f->flags &= (unsigned short)~(flags & SF_SETS);
 
     /* must have at least one of read/write */
     if (!(f->flags & SF_RDWR))
@@ -69,7 +69,7 @@ int sfset(reg Sfio_t * f, reg int flags, reg int set)
 
     /* if not shared or unseekable, public means nothing */
     if (!(f->flags & SF_SHARE) || f->extent < 0)
-	f->flags &= ~SF_PUBLIC;
+	f->flags &= (unsigned short)~SF_PUBLIC;
 
     SFOPEN(f, 0);
     SFMTXRETURN(f, (oflags & SF_FLAGS));
diff --git a/lib/sfio/sfsetbuf.c b/lib/sfio/sfsetbuf.c
index 602792a6c..2d25ee95c 100644
--- a/lib/sfio/sfsetbuf.c
+++ b/lib/sfio/sfsetbuf.c
@@ -121,7 +121,7 @@ void *sfsetbuf(reg Sfio_t * f, reg void * buf, reg size_t size)
     obuf = f->data;
     osize = f->size;
 
-    f->flags &= ~SF_MALLOC;
+    f->flags &= (unsigned short)~SF_MALLOC;
     f->bits &= ~SF_MMAP;
 
     /* pure read/string streams must have a valid string */
diff --git a/lib/sfio/sfswap.c b/lib/sfio/sfswap.c
index 16ffc8caf..dcdd25311 100644
--- a/lib/sfio/sfswap.c
+++ b/lib/sfio/sfswap.c
@@ -88,12 +88,12 @@ Sfio_t *sfswap(reg Sfio_t * f1, reg Sfio_t * f2)
     if (f2flags & SF_STATIC)
 	f2->flags |= SF_STATIC;
     else
-	f2->flags &= ~SF_STATIC;
+	f2->flags &= (unsigned short)~SF_STATIC;
 
     if (f1flags & SF_STATIC)
 	f1->flags |= SF_STATIC;
     else
-	f1->flags &= ~SF_STATIC;
+	f1->flags &= (unsigned short)~SF_STATIC;
 
     if (f2mode & SF_AVAIL) {	/* swapping to a closed stream */
 	if (!(f1->flags & SF_STATIC))
diff --git a/lib/sfio/sfwr.c b/lib/sfio/sfwr.c
index d7f0ef33b..41738348c 100644
--- a/lib/sfio/sfwr.c
+++ b/lib/sfio/sfwr.c
@@ -126,7 +126,7 @@ ssize_t sfwr(reg Sfio_t * f, reg const void * buf, reg size_t n,
 	    SFMTXRETURN(f, (ssize_t) 0);
 
 	/* clear current error states */
-	f->flags &= ~(SF_EOF | SF_ERROR);
+	f->flags &= (unsigned short)~(SF_EOF | SF_ERROR);
 
 	dc = disc;
 	if (f->flags & SF_STRING)	/* total required buffer */
-- 
2.50.1