From: Matthew Fernandez Date: Thu, 1 Oct 2020 00:54:22 +0000 (-0700) Subject: remove unused sfgetr() X-Git-Tag: 2.46.0~20^2^2~51^2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1805d6f4fcadd270625c53ec4edb389160268777;p=graphviz remove unused sfgetr() --- diff --git a/lib/sfio/Makefile.am b/lib/sfio/Makefile.am index 060289f38..9f58bda39 100644 --- a/lib/sfio/Makefile.am +++ b/lib/sfio/Makefile.am @@ -10,7 +10,7 @@ noinst_LTLIBRARIES = libsfio_C.la libsfio_C_la_SOURCES = sfclose.c sfcvt.c sfdisc.c \ sfexcept.c sfexit.c sfextern.c sffilbuf.c \ - sfflsbuf.c sfgetm.c sfgetr.c sfgetu.c \ + sfflsbuf.c sfgetm.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 \ diff --git a/lib/sfio/sfgetr.c b/lib/sfio/sfgetr.c deleted file mode 100644 index 5a3b64036..000000000 --- a/lib/sfio/sfgetr.c +++ /dev/null @@ -1,136 +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 - -/* Read a record delineated by a character. -** The record length can be accessed via sfvalue(f). -** -** Written by Kiem-Phong Vo -*/ - -/** - * @param f stream to read from. r11 on vax - * @param rc record separator. r10 on Vax - * @param type - */ -char *sfgetr(Sfio_t * f, int rc, int type) -{ - ssize_t n; - uchar *s, *ends, *us; - ssize_t un; - int found; - Sfrsrv_t *rsrv; - - SFMTXSTART(f, NIL(char *)); - - if (rc < 0 || (f->mode != SF_READ && _sfmode(f, SF_READ, 0) < 0)) - SFMTXRETURN(f, NIL(char *)); - SFLOCK(f, 0); - - /* buffer to be returned */ - rsrv = NIL(Sfrsrv_t *); - us = NIL(uchar *); - un = 0; - found = 0; - - /* compatibility mode */ - type = type < 0 ? SF_LASTR : type == 1 ? SF_STRING : type; - - if (type & SF_LASTR) { /* return the broken record */ - if ((rsrv = f->rsrv) && (un = -rsrv->slen) > 0) { - us = rsrv->data; - found = 1; - } - goto done; - } - - while (!found) { /* fill buffer if necessary */ - if ((n = (ends = f->endb) - (s = f->next)) <= 0) { /* for unseekable devices, peek-read 1 record */ - f->getr = rc; - f->mode |= SF_RC; - - /* fill buffer the conventional way */ - if (SFRPEEK(f, s, n) <= 0) { - us = NIL(uchar *); - goto done; - } else { - ends = s + n; - if (f->mode & SF_RC) { - s = ends[-1] == rc ? ends - 1 : ends; - goto do_copy; - } - } - } - if (!(s = (uchar *) memchr((char *) s, rc, n))) - s = ends; - do_copy: - if (s < ends) { - s += 1; /* include the separator */ - found = 1; - - if (!us && (!(type & SF_STRING) || !(f->flags & SF_STRING) || ((f->flags & SF_STRING) && (f->bits & SF_BOTH)))) { /* returning data in buffer */ - us = f->next; - un = s - f->next; - f->next = s; - goto done; - } - } - - /* amount to be read */ - n = s - f->next; - - /* get internal buffer */ - if (!rsrv || rsrv->size < un + n + 1) { - if (rsrv) - rsrv->slen = un; - if ((rsrv = _sfrsrv(f, un + n + 1)) != NIL(Sfrsrv_t *)) - us = rsrv->data; - else { - us = NIL(uchar *); - goto done; - } - } - - /* now copy data */ - s = us + un; - un += n; - ends = f->next; - f->next += n; - MEMCPY(s, ends, n); - } - - done: - _Sfi = f->val = un; - f->getr = 0; - if (found && rc != 0 && (type & SF_STRING)) { - us[un - 1] = '\0'; - if (us >= f->data && us < f->endb) { - f->getr = rc; - f->mode |= SF_GETR; - } - } - - /* prepare for a call to get the broken record */ - if (rsrv) - rsrv->slen = found ? 0 : -un; - - SFOPEN(f, 0); - - if (us && (type & SF_LOCKR)) { - f->mode |= SF_PEEK | SF_GETR; - f->endr = f->data; - } - - SFMTXRETURN(f, (char *) us); -} diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h index 81329fca4..7af42f856 100644 --- a/lib/sfio/sfio.h +++ b/lib/sfio/sfio.h @@ -230,7 +230,7 @@ extern "C" { #define SF_BUFCONST 0400000 /* unused flag - for compatibility only */ #endif -/* for sfgetr/sfreserve to hold a record */ +/* for sfreserve to hold a record */ #define SF_LOCKR 0000010 /* lock record, stop access to stream */ #define SF_LASTR 0000020 /* get the last incomplete record */ @@ -315,7 +315,6 @@ extern "C" { extern Sfoff_t sftell(Sfio_t *); extern Sfoff_t sfseek(Sfio_t *, Sfoff_t, int); extern ssize_t sfputr(Sfio_t *, const char *, int); - extern char *sfgetr(Sfio_t *, int, int); extern ssize_t sfnputc(Sfio_t *, int, size_t); extern int sfungetc(Sfio_t *, int); extern int sfprintf(Sfio_t *, const char *, ...); diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj index bbd420020..63d9be818 100644 --- a/lib/sfio/sfio.vcxproj +++ b/lib/sfio/sfio.vcxproj @@ -91,7 +91,6 @@ - diff --git a/lib/sfio/sfio.vcxproj.filters b/lib/sfio/sfio.vcxproj.filters index 492ce2e5f..57c34bdfa 100644 --- a/lib/sfio/sfio.vcxproj.filters +++ b/lib/sfio/sfio.vcxproj.filters @@ -68,9 +68,6 @@ Source Files - - Source Files - Source Files diff --git a/lib/sfio/sfmode.c b/lib/sfio/sfmode.c index 4045dd867..b3fd5ff12 100644 --- a/lib/sfio/sfmode.c +++ b/lib/sfio/sfmode.c @@ -133,7 +133,7 @@ int _sfsetpool(Sfio_t * f) POOLMTXRETURN(p, rv); } -/* create an auxiliary buffer for sfgetr/sfreserve/sfputr */ +/* create an auxiliary buffer for sfreserve/sfputr */ Sfrsrv_t *_sfrsrv(Sfio_t * f, ssize_t size) { Sfrsrv_t *rsrv, *rs;