remove unused sfllen() and variants

diff --git a/lib/sfio/Makefile.am b/lib/sfio/Makefile.am
index 22ddbd1c9cb3a8ad9125d32448d8175b431271e1..64a093d4e5c6d7482d6b10a6725ec2ad6862abad 100644 (file)
--- a/lib/sfio/Makefile.am
+++ b/lib/sfio/Makefile.am
@@ -11,7 +11,7 @@ noinst_LTLIBRARIES = libsfio_C.la
 libsfio_C_la_SOURCES = sfclose.c sfclrlock.c sfcvt.c sfdisc.c \
        sfexcept.c sfexit.c sfextern.c sffilbuf.c \
        sfflsbuf.c sfgetd.c sfgetl.c sfgetm.c sfgetr.c sfgetu.c \
-       sfllen.c sfmode.c sfnew.c sfnotify.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 \
        sfputr.c sfputu.c sfraise.c sfrd.c sfread.c sfreserve.c \

diff --git a/lib/sfio/Sfio_f/Makefile.am b/lib/sfio/Sfio_f/Makefile.am
index e6f274d3b8c765c9e2541166718f37ac0c9b9b40..c3bbb81b7e6a59f086b19b75d0f4c570483060f6 100644 (file)
--- 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 _sfllen.c _sfputc.c _sfputd.c \
+       _sffileno.c _sfgetc.c _sfputc.c _sfputd.c \
        _sfputl.c _sfputm.c _sfputu.c _sfslen.c _sfstacked.c \
        _sfulen.c _sfvalue.c

diff --git a/lib/sfio/Sfio_f/_sfllen.c b/lib/sfio/Sfio_f/_sfllen.c
deleted file mode 100644 (file)
index 886d8b8..0000000
--- a/lib/sfio/Sfio_f/_sfllen.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       <sfio/sfhdr.h>
-
-#undef sfllen
-
-int sfllen(Sflong_t v)
-{
-    return __sf_llen(v);
-}

diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h
index ea5e7993b6b53b03fa90c65c55be7777e629bcd1..cb16e5c142393e8e86bdbf11e16ce2d5a2b8d4a5 100644 (file)
--- a/lib/sfio/sfio.h
+++ b/lib/sfio/sfio.h
@@ -337,7 +337,6 @@ extern "C" {
     extern ssize_t sfpkrd(int, void *, size_t, int, long, int);
 
 /* portable handling of primitive types */
-    extern int sfllen(Sflong_t);
     extern int sfulen(Sfulong_t);
 
     extern int sfputd(Sfio_t *, Sfdouble_t);
@@ -360,7 +359,6 @@ extern "C" {
 
     extern int _sffilbuf(Sfio_t *, int);
 
-    extern int _sfllen(Sflong_t);
     extern int _sfulen(Sfulong_t);
 
 /* miscellaneous function analogues of fast in-line functions */
@@ -397,7 +395,6 @@ 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_llen(v)   (_sfllen((Sflong_t)(v)) )
 #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)
@@ -411,7 +408,6 @@ extern "C" {
 #define sfputm(f,v,m)                          ( __sf_putm((f),(v),(m))        )
 #define sfputc(f,c)                            ( __sf_putc((f),(c))            )
 #define sfgetc(f)                              ( __sf_getc(f)                  )
-#define sfllen(v)                              ( __sf_llen(v)                  )
 #define sfulen(v)                              ( __sf_ulen(v)                  )
 #define sffileno(f)                            ( __sf_fileno(f)                )
 #define sfstacked(f)                           ( __sf_stacked(f)               )

diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj
index 240d740126a43e1c3b7c43f2e8d3fb96983702b4..96e20031af8d68fbea7d8c24c6826926e5fc5781 100644 (file)
--- a/lib/sfio/sfio.vcxproj
+++ b/lib/sfio/sfio.vcxproj
@@ -98,7 +98,6 @@
     <ClCompile Include="sfgetu.c" />
     <ClCompile Include="sfio_f\_sffileno.c" />
     <ClCompile Include="sfio_f\_sfgetc.c" />
-    <ClCompile Include="sfio_f\_sfllen.c" />
     <ClCompile Include="sfio_f\_sfputc.c" />
     <ClCompile Include="sfio_f\_sfputd.c" />
     <ClCompile Include="sfio_f\_sfputl.c" />
@@ -108,7 +107,6 @@
     <ClCompile Include="sfio_f\_sfstacked.c" />
     <ClCompile Include="sfio_f\_sfulen.c" />
     <ClCompile Include="sfio_f\_sfvalue.c" />
-    <ClCompile Include="sfllen.c" />
     <ClCompile Include="sfmode.c" />
     <ClCompile Include="sfnew.c" />
     <ClCompile Include="sfnotify.c" />

diff --git a/lib/sfio/sfio.vcxproj.filters b/lib/sfio/sfio.vcxproj.filters
index c42162f6a1adbce8b8b3e46aacdcf6aa4084bad0..1cd6088b545c7b26e25f52033462bb000007c88e 100644 (file)
--- a/lib/sfio/sfio.vcxproj.filters
+++ b/lib/sfio/sfio.vcxproj.filters
@@ -35,9 +35,6 @@
     <ClCompile Include="sfio_f\_sfgetc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sfio_f\_sfllen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sfio_f\_sfputc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -107,9 +104,6 @@
     <ClCompile Include="sfgetu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sfllen.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sfmode.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/lib/sfio/sfllen.c b/lib/sfio/sfllen.c
deleted file mode 100644 (file)
index 4ed8526..0000000
--- a/lib/sfio/sfllen.c
+++ /dev/null
@@ -1,26 +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       <sfio/sfhdr.h>
-
-/*     Get size of a long value coded in a portable format
-**
-**     Written by Kiem-Phong Vo
-*/
-int _sfllen(Sflong_t v)
-{
-    if (v < 0)
-       v = -(v + 1);
-    v = (Sfulong_t) v >> SF_SBITS;
-    return 1 + (v > 0 ? sfulen(v) : 0);
-}