From f4c8e478974bb96e17705030ebbceeb6860acf0b Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Tue, 22 Sep 2020 20:53:32 -0700 Subject: [PATCH] remove unused sfulen() --- lib/sfio/Sfio_f/Makefile.am | 2 +- lib/sfio/Sfio_f/_sfulen.c | 21 --------------------- lib/sfio/sfio.h | 8 -------- lib/sfio/sfio.vcxproj | 1 - lib/sfio/sfio.vcxproj.filters | 3 --- 5 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 lib/sfio/Sfio_f/_sfulen.c diff --git a/lib/sfio/Sfio_f/Makefile.am b/lib/sfio/Sfio_f/Makefile.am index f40407552..ff4d04ca0 100644 --- a/lib/sfio/Sfio_f/Makefile.am +++ b/lib/sfio/Sfio_f/Makefile.am @@ -8,4 +8,4 @@ noinst_LTLIBRARIES = libsfiof_C.la libsfiof_C_la_SOURCES = \ _sffileno.c _sfgetc.c _sfputc.c \ _sfslen.c \ - _sfulen.c _sfvalue.c + _sfvalue.c diff --git a/lib/sfio/Sfio_f/_sfulen.c b/lib/sfio/Sfio_f/_sfulen.c deleted file mode 100644 index 7c072d64f..000000000 --- a/lib/sfio/Sfio_f/_sfulen.c +++ /dev/null @@ -1,21 +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 - -#undef sfulen - -int sfulen(Sfulong_t v) -{ - return __sf_ulen(v); -} diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h index a64ffc0a6..d24885353 100644 --- a/lib/sfio/sfio.h +++ b/lib/sfio/sfio.h @@ -336,9 +336,6 @@ extern "C" { extern Sfoff_t sfsk(Sfio_t *, Sfoff_t, int, Sfdisc_t *); extern ssize_t sfpkrd(int, void *, size_t, int, long, int); -/* portable handling of primitive types */ - extern int sfulen(Sfulong_t); - extern int sfputc(Sfio_t *, int); extern Sfdouble_t sfgetd(Sfio_t *); @@ -351,8 +348,6 @@ extern "C" { extern int _sffilbuf(Sfio_t *, int); - extern int _sfulen(Sfulong_t); - /* miscellaneous function analogues of fast in-line functions */ extern Sfoff_t sfsize(Sfio_t *); extern int sffileno(Sfio_t *); @@ -382,15 +377,12 @@ extern "C" { (int)(*_SF_(f)->next++ = (unsigned char)(c)) ) #define __sf_getc(f) (_SF_(f)->next >= _SF_(f)->endr ? _sffilbuf(_SF_(f),0) : \ (int)(*_SF_(f)->next++) ) -#define __sf_ulen(v) ((Sfulong_t)(v) < SF_U1 ? 1 : (Sfulong_t)(v) < SF_U2 ? 2 : \ - (Sfulong_t)(v) < SF_U3 ? 3 : (Sfulong_t)(v) < SF_U4 ? 4 : 5) #define __sf_fileno(f) ((f) ? _SF_(f)->file : -1) #define __sf_value(f) ((f) ? (_SF_(f)->val) : 0) #define __sf_slen() (_Sfi) #define sfputc(f,c) ( __sf_putc((f),(c)) ) #define sfgetc(f) ( __sf_getc(f) ) -#define sfulen(v) ( __sf_ulen(v) ) #define sffileno(f) ( __sf_fileno(f) ) #define sfvalue(f) ( __sf_value(f) ) #define sfslen() ( __sf_slen() ) diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj index ccf5d26df..6db8f0fa5 100644 --- a/lib/sfio/sfio.vcxproj +++ b/lib/sfio/sfio.vcxproj @@ -100,7 +100,6 @@ - diff --git a/lib/sfio/sfio.vcxproj.filters b/lib/sfio/sfio.vcxproj.filters index be593e052..2e9c549de 100644 --- a/lib/sfio/sfio.vcxproj.filters +++ b/lib/sfio/sfio.vcxproj.filters @@ -41,9 +41,6 @@ Source Files - - Source Files - Source Files -- 2.40.0