From 06ce5b5583f009b0e7f79df72c5ffc4722d04c1c Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Fri, 16 Oct 2020 19:17:23 -0700 Subject: [PATCH] remove unused mtx parameter to SFCLEAR() macro --- lib/sfio/sfio_t.h | 2 +- lib/sfio/sfnew.c | 2 +- lib/sfio/sfprintf.c | 2 +- lib/sfio/sfscanf.c | 2 +- lib/sfio/sfswap.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/sfio/sfio_t.h b/lib/sfio/sfio_t.h index dac230e68..4c380319d 100644 --- a/lib/sfio/sfio_t.h +++ b/lib/sfio/sfio_t.h @@ -81,7 +81,7 @@ extern "C" { } /* function to clear an Sfio_t structure */ -#define SFCLEAR(f,mtx) \ +#define SFCLEAR(f) \ ( (f)->next = (unsigned char*)0, /* next */ \ (f)->endw = (unsigned char*)0, /* endw */ \ (f)->endr = (unsigned char*)0, /* endr */ \ diff --git a/lib/sfio/sfnew.c b/lib/sfio/sfnew.c index 757432922..7bc8f4039 100644 --- a/lib/sfio/sfnew.c +++ b/lib/sfio/sfnew.c @@ -77,7 +77,7 @@ Sfio_t *sfnew(Sfio_t * oldf, void * buf, size_t size, int file, if (!f) { if (!(f = (Sfio_t *) malloc(sizeof(Sfio_t)))) return NIL(Sfio_t *); - SFCLEAR(f, NIL(Vtmutex_t *)); + SFCLEAR(f); } } diff --git a/lib/sfio/sfprintf.c b/lib/sfio/sfprintf.c index 65edaed27..3e5036b3a 100644 --- a/lib/sfio/sfprintf.c +++ b/lib/sfio/sfprintf.c @@ -39,7 +39,7 @@ int sfvsprintf(char *s, int n, const char *form, va_list args) return -1; /* make a fake stream */ - SFCLEAR(&f, NIL(Vtmutex_t *)); + SFCLEAR(&f); f.flags = SF_STRING | SF_WRITE; f.mode = SF_WRITE; f.size = n - 1; diff --git a/lib/sfio/sfscanf.c b/lib/sfio/sfscanf.c index b4293219d..b43864bb1 100644 --- a/lib/sfio/sfscanf.c +++ b/lib/sfio/sfscanf.c @@ -36,7 +36,7 @@ int sfvsscanf(const char *s, const char *form, va_list args) return -1; /* make a fake stream */ - SFCLEAR(&f, NIL(Vtmutex_t *)); + SFCLEAR(&f); f.flags = SF_STRING | SF_READ; f.mode = SF_READ; f.size = strlen(s); diff --git a/lib/sfio/sfswap.c b/lib/sfio/sfswap.c index 9f66f50d4..dbb083fd6 100644 --- a/lib/sfio/sfswap.c +++ b/lib/sfio/sfswap.c @@ -54,7 +54,7 @@ Sfio_t *sfswap(Sfio_t * f1, Sfio_t * f2) return NIL(Sfio_t *); } - SFCLEAR(f2, NIL(Vtmutex_t *)); + SFCLEAR(f2); } f2->mode = SF_AVAIL | SF_LOCK; f2mode = SF_AVAIL; -- 2.40.0