remove unused sfclrerr()

Related to #19. I do not believe this is a full fix. It just bypasses the first
error in the referenced issue.

diff --git a/lib/sfio/Sfio_f/Makefile.am b/lib/sfio/Sfio_f/Makefile.am
index 731d1495c41cee2fdf11973a2c5ab95924af6555..141316679c74f84832ceeea4fe53de15ae540145 100644 (file)
--- a/lib/sfio/Sfio_f/Makefile.am
+++ b/lib/sfio/Sfio_f/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib
 
 noinst_LTLIBRARIES = libsfiof_C.la
 
-libsfiof_C_la_SOURCES = _sfclrerr.c _sfdlen.c _sfeof.c _sferror.c \
+libsfiof_C_la_SOURCES = _sfdlen.c _sfeof.c _sferror.c \
        _sffileno.c _sfgetc.c _sfllen.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/_sfclrerr.c b/lib/sfio/Sfio_f/_sfclrerr.c
deleted file mode 100644 (file)
index 73a3ce4..0000000
--- a/lib/sfio/Sfio_f/_sfclrerr.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 sfclrerr
-
-int sfclrerr(Sfio_t * f)
-{
-    return __sf_clrerr(f);
-}

diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h
index 5b0355a72d59a5c25c0c9ab6d35cae2ddf8d397c..e89671b2ee747398d1e79baf68580def4cc33f09 100644 (file)
--- a/lib/sfio/sfio.h
+++ b/lib/sfio/sfio.h
@@ -367,7 +367,6 @@ extern "C" {
 
 /* miscellaneous function analogues of fast in-line functions */
     extern Sfoff_t sfsize(Sfio_t *);
-    extern int sfclrerr(Sfio_t *);
     extern int sfeof(Sfio_t *);
     extern int sferror(Sfio_t *);
     extern int sffileno(Sfio_t *);
@@ -409,7 +408,6 @@ extern "C" {
 #define __sf_fileno(f) ((f) ? _SF_(f)->file : -1)
 #define __sf_eof(f)    ((f) ? (_SF_(f)->flags&SF_EOF) : 0)
 #define __sf_error(f)  ((f) ? (_SF_(f)->flags&SF_ERROR) : 0)
-#define __sf_clrerr(f) ((f) ? (_SF_(f)->flags &= ~(SF_ERROR|SF_EOF)) : 0)
 #define __sf_stacked(f)        ((f) ? (_SF_(f)->push != (Sfio_t*)0) : 0)
 #define __sf_value(f)  ((f) ? (_SF_(f)->val) : 0)
 #define __sf_slen()    (_Sfi)
@@ -426,7 +424,6 @@ extern "C" {
 #define sffileno(f)                            ( __sf_fileno(f)                )
 #define sfeof(f)                               ( __sf_eof(f)                   )
 #define sferror(f)                             ( __sf_error(f)                 )
-#define sfclrerr(f)                            ( __sf_clrerr(f)                )
 #define sfstacked(f)                           ( __sf_stacked(f)               )
 #define sfvalue(f)                             ( __sf_value(f)                 )
 #define sfslen()                               ( __sf_slen()                   )

diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj
index 04711037d9b492519b0e3c4a008de6c7491381cf..6c8a55546b92623d3e5009a1960057221a33a40f 100644 (file)
--- a/lib/sfio/sfio.vcxproj
+++ b/lib/sfio/sfio.vcxproj
@@ -97,7 +97,6 @@
     <ClCompile Include="sfgetm.c" />
     <ClCompile Include="sfgetr.c" />
     <ClCompile Include="sfgetu.c" />
-    <ClCompile Include="sfio_f\_sfclrerr.c" />
     <ClCompile Include="sfio_f\_sfdlen.c" />
     <ClCompile Include="sfio_f\_sfeof.c" />
     <ClCompile Include="sfio_f\_sferror.c" />

diff --git a/lib/sfio/sfio.vcxproj.filters b/lib/sfio/sfio.vcxproj.filters
index 8fded7d67e2bc1525a637b92b1053745d7daaa9c..ab89537f479803174d4899202bf0b3ddfa690dc1 100644 (file)
--- a/lib/sfio/sfio.vcxproj.filters
+++ b/lib/sfio/sfio.vcxproj.filters
@@ -29,9 +29,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="sfio_f\_sfclrerr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sfio_f\_sfdlen.c">
       <Filter>Source Files</Filter>
     </ClCompile>