From: Matthew Fernandez Date: Wed, 23 Sep 2020 03:12:52 +0000 (-0700) Subject: remove unused sfputd() and variants X-Git-Tag: 2.46.0~20^2^2~61^2~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18d41584c2c5461971c4e0b3ace1b3823292bb7e;p=graphviz remove unused sfputd() and variants --- diff --git a/lib/sfio/Makefile.am b/lib/sfio/Makefile.am index 64a093d4e..da9b51e2c 100644 --- a/lib/sfio/Makefile.am +++ b/lib/sfio/Makefile.am @@ -13,7 +13,7 @@ libsfio_C_la_SOURCES = sfclose.c sfclrlock.c sfcvt.c sfdisc.c \ sfflsbuf.c sfgetd.c sfgetl.c sfgetm.c sfgetr.c sfgetu.c \ sfmode.c sfnew.c sfnotify.c \ sfnputc.c sfopen.c sfpkrd.c sfpoll.c sfpool.c \ - sfprintf.c sfprints.c sfpurge.c sfputd.c sfputl.c sfputm.c \ + sfprintf.c sfprints.c sfpurge.c sfputl.c sfputm.c \ sfputr.c sfputu.c sfraise.c sfrd.c sfread.c sfreserve.c \ sfresize.c sfscanf.c sfseek.c sfset.c sfsetbuf.c sfsetfd.c \ sfsize.c sfsk.c sfstack.c sfstrtod.c sfswap.c sfsync.c \ diff --git a/lib/sfio/Sfio_f/Makefile.am b/lib/sfio/Sfio_f/Makefile.am index c3bbb81b7..a1d16c0d6 100644 --- a/lib/sfio/Sfio_f/Makefile.am +++ b/lib/sfio/Sfio_f/Makefile.am @@ -6,6 +6,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib noinst_LTLIBRARIES = libsfiof_C.la libsfiof_C_la_SOURCES = \ - _sffileno.c _sfgetc.c _sfputc.c _sfputd.c \ + _sffileno.c _sfgetc.c _sfputc.c \ _sfputl.c _sfputm.c _sfputu.c _sfslen.c _sfstacked.c \ _sfulen.c _sfvalue.c diff --git a/lib/sfio/Sfio_f/_sfputd.c b/lib/sfio/Sfio_f/_sfputd.c deleted file mode 100644 index 130654018..000000000 --- a/lib/sfio/Sfio_f/_sfputd.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 sfputd - -int sfputd(Sfio_t * f, Sfdouble_t d) -{ - return __sf_putd(f, d); -} diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h index cb16e5c14..021cf9ef4 100644 --- a/lib/sfio/sfio.h +++ b/lib/sfio/sfio.h @@ -339,7 +339,6 @@ extern "C" { /* portable handling of primitive types */ extern int sfulen(Sfulong_t); - extern int sfputd(Sfio_t *, Sfdouble_t); extern int sfputl(Sfio_t *, Sflong_t); extern int sfputu(Sfio_t *, Sfulong_t); extern int sfputm(Sfio_t *, Sfulong_t, Sfulong_t); @@ -351,7 +350,6 @@ extern "C" { extern Sfulong_t sfgetm(Sfio_t *, Sfulong_t); extern int sfgetc(Sfio_t *); - extern int _sfputd(Sfio_t *, Sfdouble_t); extern int _sfputl(Sfio_t *, Sflong_t); extern int _sfputu(Sfio_t *, Sfulong_t); extern int _sfputm(Sfio_t *, Sfulong_t, Sfulong_t); @@ -386,7 +384,6 @@ extern "C" { #else #define _SF_(f) ((Sfio_t*)(f)) #endif -#define __sf_putd(f,v) (_sfputd(_SF_(f),(Sfdouble_t)(v))) #define __sf_putl(f,v) (_sfputl(_SF_(f),(Sflong_t)(v))) #define __sf_putu(f,v) (_sfputu(_SF_(f),(Sfulong_t)(v))) #define __sf_putm(f,v,m) (_sfputm(_SF_(f),(Sfulong_t)(v),(Sfulong_t)(m))) @@ -402,7 +399,6 @@ extern "C" { #define __sf_value(f) ((f) ? (_SF_(f)->val) : 0) #define __sf_slen() (_Sfi) -#define sfputd(f,v) ( __sf_putd((f),(v)) ) #define sfputl(f,v) ( __sf_putl((f),(v)) ) #define sfputu(f,v) ( __sf_putu((f),(v)) ) #define sfputm(f,v,m) ( __sf_putm((f),(v),(m)) ) diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj index 96e20031a..94653ae85 100644 --- a/lib/sfio/sfio.vcxproj +++ b/lib/sfio/sfio.vcxproj @@ -99,7 +99,6 @@ - @@ -118,7 +117,6 @@ - diff --git a/lib/sfio/sfio.vcxproj.filters b/lib/sfio/sfio.vcxproj.filters index 1cd6088b5..a3382ab42 100644 --- a/lib/sfio/sfio.vcxproj.filters +++ b/lib/sfio/sfio.vcxproj.filters @@ -38,9 +38,6 @@ Source Files - - Source Files - Source Files @@ -137,9 +134,6 @@ Source Files - - Source Files - Source Files diff --git a/lib/sfio/sfputd.c b/lib/sfio/sfputd.c deleted file mode 100644 index 6a097ecdf..000000000 --- a/lib/sfio/sfputd.c +++ /dev/null @@ -1,84 +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 - -#include -#include - -/* Write out a floating point value in a portable format -** -** Written by Kiem-Phong Vo. -*/ - -int _sfputd(Sfio_t * f, Sfdouble_t v) -{ -#define N_ARRAY (16*sizeof(Sfdouble_t)) - ssize_t n, w; - uchar *s, *ends; - int exp; - uchar c[N_ARRAY]; - double x; - - SFMTXSTART(f, -1); - - if (f->mode != SF_WRITE && _sfmode(f, SF_WRITE, 0) < 0) - SFMTXRETURN(f, -1); - SFLOCK(f, 0); - - /* get the sign of v */ - if (v < 0.) { - v = -v; - n = 1; - } else - n = 0; - - /* make the magnitude of v < 1 */ - if (v != 0.) - v = frexp(v, &exp); - else - exp = 0; - - /* code the sign of v and exp */ - if ((w = exp) < 0) { - n |= 02; - w = -w; - } - - /* write out the signs and the exp */ - SFOPEN(f, 0); - if (sfputc(f, n) < 0 || (w = sfputu(f, w)) < 0) - SFMTXRETURN(f, -1); - SFLOCK(f, 0); - w += 1; - - s = (ends = &c[0]) + sizeof(c); - while (s > ends) { /* get 2^SF_PRECIS precision at a time */ - n = (int) (x = ldexp(v, SF_PRECIS)); - *--s = n | SF_MORE; - v = x - n; - if (v <= 0.) - break; - } - - /* last byte is not SF_MORE */ - ends = &c[0] + sizeof(c) - 1; - *ends &= ~SF_MORE; - - /* write out coded bytes */ - n = ends - s + 1; - w = SFWRITE(f, (void *) s, n) == n ? w + n : -1; - - SFOPEN(f, 0); - SFMTXRETURN(f, w); -}