From 09574f4d59218eaf70b42652ad659449af7a6e07 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Fri, 9 Oct 2020 17:29:14 -0700 Subject: [PATCH] remove unused sfset() --- lib/sfio/Makefile.am | 2 +- lib/sfio/sfio.h | 1 - lib/sfio/sfio.vcxproj | 1 - lib/sfio/sfio.vcxproj.filters | 3 -- lib/sfio/sfset.c | 76 ----------------------------------- 5 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 lib/sfio/sfset.c diff --git a/lib/sfio/Makefile.am b/lib/sfio/Makefile.am index 7d4e07e91..f5eb571c4 100644 --- a/lib/sfio/Makefile.am +++ b/lib/sfio/Makefile.am @@ -15,7 +15,7 @@ libsfio_C_la_SOURCES = sfclose.c sfcvt.c sfdisc.c \ sfnputc.c sfopen.c sfpkrd.c \ sfprintf.c \ sfputr.c sfraise.c sfrd.c sfread.c \ - sfresize.c sfscanf.c sfseek.c sfset.c sfsetbuf.c sfsetfd.c \ + sfresize.c sfscanf.c sfseek.c sfsetbuf.c sfsetfd.c \ sfsize.c sfsk.c sfstack.c sfstrtod.c sfswap.c sfsync.c \ sftable.c sftell.c sftmp.c sfungetc.c sfvprintf.c \ sfvscanf.c sfwr.c sfwrite.c diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h index a2242b405..c533cafe7 100644 --- a/lib/sfio/sfio.h +++ b/lib/sfio/sfio.h @@ -297,7 +297,6 @@ extern "C" { extern void *sfsetbuf(Sfio_t *, void *, size_t); extern Sfdisc_t *sfdisc(Sfio_t *, Sfdisc_t *); extern int sfraise(Sfio_t *, int, void *); - extern int sfset(Sfio_t *, int, int); extern int sfsetfd(Sfio_t *, int); extern ssize_t sfread(Sfio_t *, void *, size_t); extern ssize_t sfwrite(Sfio_t *, const void *, size_t); diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj index 52e914e1f..c42e669f4 100644 --- a/lib/sfio/sfio.vcxproj +++ b/lib/sfio/sfio.vcxproj @@ -107,7 +107,6 @@ - diff --git a/lib/sfio/sfio.vcxproj.filters b/lib/sfio/sfio.vcxproj.filters index c46040831..c3c86e8c6 100644 --- a/lib/sfio/sfio.vcxproj.filters +++ b/lib/sfio/sfio.vcxproj.filters @@ -104,9 +104,6 @@ Source Files - - Source Files - Source Files diff --git a/lib/sfio/sfset.c b/lib/sfio/sfset.c deleted file mode 100644 index cbff5e6ec..000000000 --- a/lib/sfio/sfset.c +++ /dev/null @@ -1,76 +0,0 @@ -/* $Id$ $Revision$ */ -/* vim:set shiftwidth=4 ts=8: */ - -/************************************************************************* - * Copyright (c) 2011 AT&T Intellectual Property - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: See CVS logs. Details at http://www.graphviz.org/ - *************************************************************************/ - -#include - -/* Set some control flags or file descript for the stream -** -** Written by Kiem-Phong Vo. -*/ - -int sfset(Sfio_t * f, int flags, int set) -{ - int oflags; - - SFMTXSTART(f, 0); - - if (flags == 0 && set == 0) - SFMTXRETURN(f, (f->flags & SF_FLAGS)); - - if ((oflags = (f->mode & SF_RDWR)) != (int) f->mode - && _sfmode(f, oflags, 0) < 0) - SFMTXRETURN(f, 0); - - if (flags == 0) - SFMTXRETURN(f, (f->flags & SF_FLAGS)); - - SFLOCK(f, 0); - - /* preserve at least one rd/wr flag */ - oflags = f->flags; - if (!(f->bits & SF_BOTH) || (flags & SF_RDWR) == SF_RDWR) - flags &= ~SF_RDWR; - - /* set the flag */ - if (set) - f->flags |= (flags & SF_SETS); - else - f->flags &= (unsigned short)~(flags & SF_SETS); - - /* must have at least one of read/write */ - if (!(f->flags & SF_RDWR)) - f->flags |= (oflags & SF_RDWR); - - if (f->extent < 0) - f->flags &= ~SF_APPENDWR; - - /* turn to appropriate mode as necessary */ - if ((flags &= SF_RDWR)) { - if (!set) { - if (flags == SF_READ) - flags = SF_WRITE; - else - flags = SF_READ; - } - if ((flags == SF_WRITE && !(f->mode & SF_WRITE)) || - (flags == SF_READ && !(f->mode & (SF_READ | SF_SYNCED)))) - (void) _sfmode(f, flags, 1); - } - - /* if not shared or unseekable, public means nothing */ - if (!(f->flags & SF_SHARE) || f->extent < 0) - f->flags &= (unsigned short)~SF_PUBLIC; - - SFOPEN(f, 0); - SFMTXRETURN(f, (oflags & SF_FLAGS)); -} -- 2.40.0