[svn] Convert URLs in <form action=...>.

[wget] / src / rbuf.h

diff --git a/src/rbuf.h b/src/rbuf.h
index 415933ce03489927613673426b986dd0b1a3359a..88497d49b8b534cfa34278a0b07cf8408f2e1c54 100644 (file)
--- a/src/rbuf.h
+++ b/src/rbuf.h
@@ -1,20 +1,20 @@
 /* Declarations for rbuf.c.
    Copyright (C) 1998 Free Software Foundation, Inc.
 
-This file is part of Wget.
+This file is part of GNU Wget.
 
-This program is free software; you can redistribute it and/or modify
+GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+along with Wget; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef RBUF_H
@@ -49,39 +49,19 @@ struct rbuf
    result of historical implementation of header code.  The macro
    should return the character or EOF, and in case of error store it
    to rbuf->err or something.  */
-#ifdef HAVE_SSL
-/* SSL version of rbuf. If rbuf.ssl isn't NULL use ssl_iread instead 
-   of iread  */
-#define RBUF_READCHAR(rbuf, store)                                     \
-((rbuf)->buffer_left                                                   \
- ? (--(rbuf)->buffer_left,                                             \
-    *((char *) (store)) = *(rbuf)->buffer_pos++, 1)                    \
- : ((rbuf)->buffer_pos = (rbuf)->buffer,                               \
-    ((((rbuf)->internal_dont_touch_this                                        \
-               = (rbuf->ssl == NULL) ? (iread ((rbuf)->fd, (rbuf)->buffer,                             \
-               sizeof ((rbuf)->buffer))) : (ssl_iread ((rbuf)->ssl, (rbuf)->buffer,            \
-               sizeof ((rbuf)->buffer))) ) <= 0)                               \
-     ? (rbuf)->internal_dont_touch_this                                        \
-     : ((rbuf)->buffer_left = (rbuf)->internal_dont_touch_this - 1,    \
-       *((char *) (store)) = *(rbuf)->buffer_pos++,                    \
-       1))))
-#else
+
 #define RBUF_READCHAR(rbuf, store)                                     \
 ((rbuf)->buffer_left                                                   \
  ? (--(rbuf)->buffer_left,                                             \
     *((char *) (store)) = *(rbuf)->buffer_pos++, 1)                    \
  : ((rbuf)->buffer_pos = (rbuf)->buffer,                               \
     ((((rbuf)->internal_dont_touch_this                                        \
-       = iread ((rbuf)->fd, (rbuf)->buffer,                            \
-               sizeof ((rbuf)->buffer))) <= 0)                         \
+       = rbuf_read_bufferful (rbuf)) <= 0)                             \
      ? (rbuf)->internal_dont_touch_this                                        \
      : ((rbuf)->buffer_left = (rbuf)->internal_dont_touch_this - 1,    \
        *((char *) (store)) = *(rbuf)->buffer_pos++,                    \
        1))))
 
-
-#endif /* HAVE_SSL */
-
 /* Return the file descriptor of RBUF.  */
 #define RBUF_FD(rbuf) ((rbuf)->fd)
 
@@ -97,4 +77,7 @@ int rbuf_peek PARAMS ((struct rbuf *, char *));
 int rbuf_flush PARAMS ((struct rbuf *, char *, int));
 void rbuf_discard PARAMS ((struct rbuf *));
 
+/* Internal, but used by the macro. */
+int rbuf_read_bufferful PARAMS ((struct rbuf *));
+
 #endif /* RBUF_H */