remove some compiler warnings from ~-ing bits field

Suppresses 15 compilers warnings.

diff --git a/lib/sfio/sfdisc.c b/lib/sfio/sfdisc.c
index 6500ea859ac97e60922d8b7cb6de8970dc6a543d..7e2f28d6eb0ae7320b7b93f6e8f9949f72fff0bf 100644 (file)
--- a/lib/sfio/sfdisc.c
+++ b/lib/sfio/sfdisc.c
@@ -124,7 +124,7 @@ Sfdisc_t *sfdisc(reg Sfio_t * f, reg Sfdisc_t * disc)
 
        if (reinit) {
            SETLOCAL(f);
-           f->bits &= ~SF_NULL;        /* turn off /dev/null handling */
+           f->bits &= (unsigned short)~SF_NULL;        /* turn off /dev/null handling */
            if ((f->bits & SF_MMAP) || (f->mode & SF_INIT))
                sfsetbuf(f, NIL(void *), (size_t) SF_UNBOUND);
            else if (f->data == f->tiny)

diff --git a/lib/sfio/sffilbuf.c b/lib/sfio/sffilbuf.c
index 437c392b294b6ed4a1002f95c1f0e3fa0abd3dea..ba769b28e0c94465f687be00097c9abc0ba710f6 100644 (file)
--- a/lib/sfio/sffilbuf.c
+++ b/lib/sfio/sffilbuf.c
@@ -41,7 +41,7 @@ int _sffilbuf(Sfio_t * f, reg int n)
     rc = f->getr;
 
     justseek = f->bits & SF_JUSTSEEK;
-    f->bits &= ~SF_JUSTSEEK;
+    f->bits &= (unsigned short)~SF_JUSTSEEK;
 
     for (first = 1;; first = 0, (f->mode &= ~SF_LOCK)) {       /* check mode */
        if (SFMODE(f, local) != SF_READ && _sfmode(f, SF_READ, local) < 0)

diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index 13389d9c727543574f58f5a25973f4d6857fb063..ba5f1e4fef11a556efedd7fb1d41d061f05571a4 100644 (file)
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -183,8 +183,8 @@ extern "C" {
 #define SF_MVSIZE      00002000
 #define SFMVSET(f)     (((f)->size *= SF_NMAP), ((f)->bits |= SF_MVSIZE) )
 #define SFMVUNSET(f)   (!((f)->bits&SF_MVSIZE) ? 0 : \
-                               (((f)->bits &= ~SF_MVSIZE), ((f)->size /= SF_NMAP)) )
-#define SFCLRBITS(f)   (SFMVUNSET(f), ((f)->bits &= ~(SF_DCDOWN|SF_MVSIZE)) )
+                               (((f)->bits &= (unsigned short)~SF_MVSIZE), ((f)->size /= SF_NMAP)) )
+#define SFCLRBITS(f)   (SFMVUNSET(f), ((f)->bits &= (unsigned short)~(SF_DCDOWN|SF_MVSIZE)) )
 
 /* bits for the mode field, SF_INIT defined in sfio_t.h */
 #define SF_RC          00000010u       /* peeking for a record                 */
@@ -555,17 +555,17 @@ extern "C" {
 #define SFDCRD(f,buf,n,dc,rv) \
        {       int             dcdown = f->bits&SF_DCDOWN; f->bits |= SF_DCDOWN; \
                rv = (*dc->readf)(f,buf,n,dc); \
-               if(!dcdown)     f->bits &= ~SF_DCDOWN; \
+               if(!dcdown)     f->bits &= (unsigned short)~SF_DCDOWN; \
        }
 #define SFDCWR(f,buf,n,dc,rv) \
        {       int             dcdown = f->bits&SF_DCDOWN; f->bits |= SF_DCDOWN; \
                rv = (*dc->writef)(f,buf,n,dc); \
-               if(!dcdown)     f->bits &= ~SF_DCDOWN; \
+               if(!dcdown)     f->bits &= (unsigned short)~SF_DCDOWN; \
        }
 #define SFDCSK(f,addr,type,dc,rv) \
        {       int             dcdown = f->bits&SF_DCDOWN; f->bits |= SF_DCDOWN; \
                rv = (*dc->seekf)(f,addr,type,dc); \
-               if(!dcdown)     f->bits &= ~SF_DCDOWN; \
+               if(!dcdown)     f->bits &= (unsigned short)~SF_DCDOWN; \
        }
 
 /* fast peek of a stream */

diff --git a/lib/sfio/sfopen.c b/lib/sfio/sfopen.c
index 70b2f9db6832b1d51c550b1eec570b35294cb985..71c07ddae665d825454835f05821b54f61d5c44c 100644 (file)
--- a/lib/sfio/sfopen.c
+++ b/lib/sfio/sfopen.c
@@ -58,7 +58,7 @@ Sfio_t *sfopen(reg Sfio_t * f, const char *file, const char *mode)
                if ((f->flags & SF_RDWR) == SF_RDWR)
                    f->bits |= SF_BOTH;
                else
-                   f->bits &= ~SF_BOTH;
+                   f->bits &= (unsigned short)~SF_BOTH;
 
                if (f->flags & SF_READ)
                    f->mode = (f->mode & ~SF_WRITE) | SF_READ;

diff --git a/lib/sfio/sfrd.c b/lib/sfio/sfrd.c
index c68be86d21d643713a04a1d94c84c70884f8c069..88922efffc6ad2137209d9bc86c1d37aff6a34f9 100644 (file)
--- a/lib/sfio/sfrd.c
+++ b/lib/sfio/sfrd.c
@@ -59,7 +59,7 @@ ssize_t sfrd(reg Sfio_t * f, reg void * buf, reg size_t n,
     GETLOCAL(f, local);
     if ((rcrv = f->mode & (SF_RC | SF_RV)))
        f->mode &= ~(SF_RC | SF_RV);
-    f->bits &= ~SF_JUSTSEEK;
+    f->bits &= (unsigned short)~SF_JUSTSEEK;
 
     if (f->mode & SF_PKRD)
        SFMTXRETURN(f, -1);

diff --git a/lib/sfio/sfread.c b/lib/sfio/sfread.c
index 4b4049ba5343f7836bbf913d8d31728c090095c3..e5003927bed8c03ee246cd1b281984ebf1bda9e1 100644 (file)
--- a/lib/sfio/sfread.c
+++ b/lib/sfio/sfread.c
@@ -34,7 +34,7 @@ ssize_t sfread(reg Sfio_t * f, void * buf, reg size_t n)
 
     GETLOCAL(f, local);
     justseek = f->bits & SF_JUSTSEEK;
-    f->bits &= ~SF_JUSTSEEK;
+    f->bits &= (unsigned short)~SF_JUSTSEEK;
 
     if (!buf)
        SFMTXRETURN(f, (ssize_t) (-1));

diff --git a/lib/sfio/sfsetbuf.c b/lib/sfio/sfsetbuf.c
index 302865aa8aaf52a19324baec95e5e9d7cfb5e7cb..eaaeb3c4ce02ee665ccc31f9afe069549531324e 100644 (file)
--- a/lib/sfio/sfsetbuf.c
+++ b/lib/sfio/sfsetbuf.c
@@ -122,7 +122,7 @@ void *sfsetbuf(reg Sfio_t * f, reg void * buf, reg size_t size)
     osize = f->size;
 
     f->flags &= (unsigned short)~SF_MALLOC;
-    f->bits &= ~SF_MMAP;
+    f->bits &= (unsigned short)~SF_MMAP;
 
     /* pure read/string streams must have a valid string */
     if ((f->flags & (SF_RDWR | SF_STRING)) == SF_RDSTR &&

diff --git a/lib/sfio/sfsetfd.c b/lib/sfio/sfsetfd.c
index b95c43d8c73ed7e7beb21025d70d21b5fd5c86bf..59028db5ad9dd524866d04543a65a75cdcb73236 100644 (file)
--- a/lib/sfio/sfsetfd.c
+++ b/lib/sfio/sfsetfd.c
@@ -86,7 +86,7 @@ int sfsetfd(reg Sfio_t * f, reg int newfd)
                f->endb = f->endr = f->endw = f->data;
                f->extent = f->here = 0;
                f->mode = (f->mode & SF_RDWR) | SF_INIT;
-               f->bits &= ~SF_NULL;    /* off /dev/null handling */
+               f->bits &= (unsigned short)~SF_NULL;    /* off /dev/null handling */
            }
        }
 

diff --git a/lib/sfio/sfsync.c b/lib/sfio/sfsync.c
index 273999df4170493dbcad9b6f19a48466656f302a..699b74afcf9777cf3084ebef242492d05517fa3d 100644 (file)
--- a/lib/sfio/sfsync.c
+++ b/lib/sfio/sfsync.c
@@ -115,7 +115,7 @@ int sfsync(reg Sfio_t * f)
            if (!SFISNULL(f) && (f->bits & SF_HOLE)) {  /* realize a previously created hole of 0's */
                if (SFSK(f, (Sfoff_t) (-1), SEEK_CUR, f->disc) >= 0)
                    (void) SFWR(f, "", 1, f->disc);
-               f->bits &= ~SF_HOLE;
+               f->bits &= (unsigned short)~SF_HOLE;
            }
            f->mode |= pool;
        }

diff --git a/lib/sfio/sfwr.c b/lib/sfio/sfwr.c
index 41738348c2db43407903b5ae079feb6452d2a351..a7e266af8d036dce5b1ca14fd8406bea8957f462 100644 (file)
--- a/lib/sfio/sfwr.c
+++ b/lib/sfio/sfwr.c
@@ -76,7 +76,7 @@ static ssize_t sfoutput(Sfio_t * f, reg char *buf, reg size_t n)
            }
            if ((wr = write(f->file, wbuf, buf - wbuf)) > 0) {
                w += wr;
-               f->bits &= ~SF_HOLE;
+               f->bits &= (unsigned short)~SF_HOLE;
            }
            if (wr != (buf - wbuf))
                break;
@@ -173,7 +173,7 @@ ssize_t sfwr(reg Sfio_t * f, reg const void * buf, reg size_t n,
            } else {
              do_write:
                if ((w = write(f->file, (char *) buf, n)) > 0)
-                   f->bits &= ~SF_HOLE;
+                   f->bits &= (unsigned short)~SF_HOLE;
            }
 
            if (errno == 0)