[Cvs-cvs] ccvs/src ChangeLog buffer.c buffer.h

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/04 18:15:15

Modified files:
        src            : ChangeLog buffer.c buffer.h 

Log message:
        * buffer.h, buffer.c: Enable the generic functions and memory buffers
        even when client and server support is disabled.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3398&tr2=1.3399&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/buffer.c.diff?tr1=1.72&tr2=1.73&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/buffer.h.diff?tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3398 ccvs/src/ChangeLog:1.3399
--- ccvs/src/ChangeLog:1.3398   Thu May  4 17:47:54 2006
+++ ccvs/src/ChangeLog  Thu May  4 18:15:15 2006
@@ -1,5 +1,8 @@
 2006-05-04  Derek Price  <address@hidden>
 
+       * buffer.h, buffer.c: Enable the generic functions and memory buffers
+       even when client and server support is disabled.
+
        * buffer.c: Add comments before #includes.
 
        * commit.c (commit), edit.c (watch_off): Suppress warnings with
Index: ccvs/src/buffer.c
diff -u ccvs/src/buffer.c:1.72 ccvs/src/buffer.c:1.73
--- ccvs/src/buffer.c:1.72      Thu May  4 14:55:32 2006
+++ ccvs/src/buffer.c   Thu May  4 18:15:15 2006
@@ -26,16 +26,6 @@
 
 
 
-#if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
-
-# include <sys/socket.h>
-
-/* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
-   a different error into EIO strikes me as pretty dubious.  */
-# if !defined( EIO )
-#   define EIO EBADPOS
-# endif
-
 /* Local functions.  */
 static void buf_default_memory_error (struct buffer *);
 static struct buffer_data *get_buffer_data (void);
@@ -148,7 +138,7 @@
 
 
 
-# if defined (SERVER_FLOWCONTROL) || defined (PROXY_SUPPORT)
+#if defined (SERVER_FLOWCONTROL) || defined (PROXY_SUPPORT)
 /*
  * Count how much data is stored in the buffer..
  * Note that each buffer is a xmalloc'ed chunk BUFFER_DATA_SIZE.
@@ -164,7 +154,7 @@
 
     return mem;
 }
-# endif /* SERVER_FLOWCONTROL || PROXY_SUPPORT */
+#endif /* SERVER_FLOWCONTROL || PROXY_SUPPORT */
 
 
 
@@ -501,7 +491,7 @@
 
 
 
-# ifdef PROXY_SUPPORT
+#ifdef PROXY_SUPPORT
 /* Copy data structures and append them to a buffer.
  *
  * ERRORS
@@ -536,7 +526,7 @@
 
     buf_append_data (buf, first, new);
 }
-# endif /* PROXY_SUPPORT */
+#endif /* PROXY_SUPPORT */
 
 
 
@@ -1274,6 +1264,18 @@
 
 
 
+#if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
+
+# include <sys/socket.h>
+
+/* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
+   a different error into EIO strikes me as pretty dubious.  */
+# if !defined (EIO)
+#   define EIO EBADPOS
+# endif
+
+
+
 /* Certain types of communication input and output data in packets,
    where each packet is translated in some fashion.  The packetizing
    buffer type supports that, given a buffer which handles lower level
Index: ccvs/src/buffer.h
diff -u ccvs/src/buffer.h:1.29 ccvs/src/buffer.h:1.30
--- ccvs/src/buffer.h:1.29      Thu May  4 17:47:54 2006
+++ ccvs/src/buffer.h   Thu May  4 18:15:15 2006
@@ -23,12 +23,13 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+/* GNULIB headers.  */
+#include "getpagesize.h"
+
 /* CVS headers.  */
 #include "root.h"
 
-#if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
 
-# include "getpagesize.h"
 
 /*
  * We must read data from a child process and send it across the
@@ -149,13 +150,10 @@
                                type_buf_memory_error,
                                void *);
 void buf_free (struct buffer *);
+
+/* Memory buffer.  */
 struct buffer *buf_nonio_initialize (void (*) (struct buffer *));
-struct buffer *compress_buffer_initialize (struct buffer *, int, int,
-                                          void (*) (struct buffer *));
-struct buffer *packetizing_buffer_initialize
-       (struct buffer *, int (*) (void *, const char *, char *, size_t),
-        int (*) (void *, const char *, char *, size_t, size_t *), void *,
-        void (*) (struct buffer *));
+
 int buf_empty (struct buffer *);
 int buf_empty_p (struct buffer *);
 void buf_output (struct buffer *, const char *, size_t);
@@ -194,6 +192,14 @@
 int buf_count_mem (struct buffer *);
 #endif /* SERVER_FLOWCONTROL */
 
+#if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
+
+struct buffer *compress_buffer_initialize (struct buffer *, int, int,
+                                          void (*) (struct buffer *));
+struct buffer *packetizing_buffer_initialize
+       (struct buffer *, int (*) (void *, const char *, char *, size_t),
+        int (*) (void *, const char *, char *, size_t, size_t *), void *,
+        void (*) (struct buffer *));
 struct buffer *
 fd_buffer_initialize (int fd, pid_t child_pid, cvsroot_t *root, bool input,
                       long timeout, void (*memory) (struct buffer *));