From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 13 Jan 2010 00:32:43 +0000 (+0000)
Subject: stream: remove unused stream_read_unblock
X-Git-Tag: frr-2.0-rc1~785
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2ed9b70316ede07ccfcf25153cd3406ba55e890a;p=mirror%2Ffrr.git

stream: remove unused stream_read_unblock

The one place this was being used in BGP is now gone,
can remove deprecated interface.
Acked-by: Feng Lu <lu.feng@6wind.com>

(cherry picked from commit 3790eb0d3f0bbb24b9c6be97f547cec144ee05d1)
---

diff --git a/lib/stream.c b/lib/stream.c
index 11f35d884e..b0838e7934 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -817,32 +817,6 @@ stream_read (struct stream *s, int fd, size_t size)
   return nbytes;
 }
 
-/* Read size from fd. */
-int
-stream_read_unblock (struct stream *s, int fd, size_t size)
-{
-  int nbytes;
-  int val;
-  
-  STREAM_VERIFY_SANE(s);
-  
-  if (STREAM_WRITEABLE (s) < size)
-    {
-      STREAM_BOUND_WARN (s, "put");
-      return 0;
-    }
-  
-  val = fcntl (fd, F_GETFL, 0);
-  fcntl (fd, F_SETFL, val|O_NONBLOCK);
-  nbytes = read (fd, s->data + s->endp, size);
-  fcntl (fd, F_SETFL, val);
-
-  if (nbytes > 0)
-    s->endp += nbytes;
-  
-  return nbytes;
-}
-
 ssize_t
 stream_read_try(struct stream *s, int fd, size_t size)
 {
diff --git a/lib/stream.h b/lib/stream.h
index 32d2668310..738034438c 100644
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -199,10 +199,6 @@ extern u_int32_t stream_get_ipv4 (struct stream *);
    Use stream_read_try instead.  */
 extern int stream_read (struct stream *, int, size_t);
 
-/* Deprecated: all file descriptors should already be non-blocking.
-   Will be removed.  Use stream_read_try instead. */
-extern int stream_read_unblock (struct stream *, int, size_t);
-
 /* Read up to size bytes into the stream.
    Return code:
      >0: number of bytes read