[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
patch1
|
From: |
Bear Giles |
|
Subject: |
patch1 |
|
Date: |
Tue, 12 Jun 2001 21:39:16 -0600 (MDT) |
diff -Naur --recursive cvs.orig/src/CVS/Entries cvs/src/CVS/Entries
--- cvs.orig/src/CVS/Entries Tue Jun 12 17:42:11 2001
+++ cvs/src/CVS/Entries Tue Jun 12 17:44:25 2001
@@ -6,18 +6,18 @@
/ChangeLog-97/1.1.1.1/Sun Jun 10 04:09:10 2001/-ko/
/Makefile.am/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
/Makefile.in/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
-/add.c/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
+/add.c/1.2/Tue Jun 12 23:43:12 2001/-ko/
/admin.c/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
/annotate.c/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
-/buffer.c/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
-/buffer.h/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
+/buffer.c/1.2/Tue Jun 12 23:43:12 2001/-ko/
+/buffer.h/1.2/Tue Jun 12 23:43:12 2001/-ko/
/build_src.com/1.1.1.1/Sun Jun 10 04:09:10 2001/-ko/
-/checkin.c/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
+/checkin.c/1.2/Tue Jun 12 23:43:12 2001/-ko/
/checkout.c/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
/classify.c/1.1.1.1/Sun Jun 10 04:09:04 2001/-ko/
-/client.c/1.1.1.1/Sun Jun 10 04:09:04 2001/-ko/
-/client.h/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
-/commit.c/1.1.1.1/Sun Jun 10 04:09:04 2001/-ko/
+/client.c/1.2/Tue Jun 12 23:43:12 2001/-ko/
+/client.h/1.2/Tue Jun 12 23:43:12 2001/-ko/
+/commit.c/1.2/Tue Jun 12 23:43:12 2001/-ko/
/create_adm.c/1.1.1.1/Sun Jun 10 04:09:04 2001/-ko/
/cvs.h/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
/cvsbug.in/1.1.1.1/Sun Jun 10 04:09:03 2001/-ko/
@@ -64,13 +64,13 @@
/run.c/1.1.1.1/Sun Jun 10 04:09:07 2001/-ko/
/sanity.sh/1.1.1.1/Sun Jun 10 04:09:13 2001/-ko/
/scramble.c/1.1.1.1/Sun Jun 10 04:09:07 2001/-ko/
-/server.c/1.1.1.1/Sun Jun 10 04:09:07 2001/-ko/
+/server.c/1.2/Tue Jun 12 23:43:12 2001/-ko/
/server.h/1.1.1.1/Sun Jun 10 04:09:09 2001/-ko/
/stamp-h2.in/1.1.1.1/Sun Jun 10 04:09:02 2001/-ko/
/status.c/1.1.1.1/Sun Jun 10 04:09:07 2001/-ko/
/subr.c/1.1.1.1/Sun Jun 10 04:09:07 2001/-ko/
/tag.c/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
-/update.c/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
+/update.c/1.2/Tue Jun 12 23:43:12 2001/-ko/
/update.h/1.1.1.1/Sun Jun 10 04:09:09 2001/-ko/
/vers_ts.c/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
/version.c/1.1.1.1/Sun Jun 10 04:09:09 2001/-ko/
@@ -78,5 +78,5 @@
/watch.c/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
/watch.h/1.1.1.1/Sun Jun 10 04:09:09 2001/-ko/
/wrapper.c/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
-/zlib.c/1.1.1.1/Sun Jun 10 04:09:08 2001/-ko/
+/zlib.c/1.2/Tue Jun 12 23:43:13 2001/-ko/
D
diff -Naur --recursive cvs.orig/src/add.c cvs/src/add.c
--- cvs.orig/src/add.c Sat Jun 9 22:09:03 2001
+++ cvs/src/add.c Tue Jun 12 17:43:12 2001
@@ -27,6 +27,7 @@
#include "cvs.h"
#include "savecwd.h"
#include "fileattr.h"
+#include "buffer.h"
static int add_directory PROTO ((struct file_info *finfo));
static int build_entry PROTO((char *repository, char *user, char *options,
diff -Naur --recursive cvs.orig/src/buffer.c cvs/src/buffer.c
--- cvs.orig/src/buffer.c Sat Jun 9 22:09:03 2001
+++ cvs/src/buffer.c Tue Jun 12 17:43:12 2001
@@ -16,25 +16,25 @@
static struct buffer_data *free_buffer_data;
/* Local functions. */
-static void buf_default_memory_error PROTO ((struct buffer *));
+static void buf_default_memory_error PROTO ((BUFFER *));
static void allocate_buffer_datas PROTO((void));
static struct buffer_data *get_buffer_data PROTO((void));
/* Initialize a buffer structure. */
-struct buffer *
+BUFFER *
buf_initialize (input, output, flush, block, shutdown, memory, closure)
int (*input) PROTO((void *, char *, int, int, int *));
int (*output) PROTO((void *, const char *, int, int *));
int (*flush) PROTO((void *));
int (*block) PROTO((void *, int));
int (*shutdown) PROTO((void *));
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
void *closure;
{
- struct buffer *buf;
+ BUFFER *buf;
- buf = (struct buffer *) xmalloc (sizeof (struct buffer));
+ buf = (BUFFER *) xmalloc (sizeof (BUFFER));
buf->data = NULL;
buf->last = NULL;
buf->nonblocking = 0;
@@ -52,7 +52,7 @@
void
buf_free (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
if (buf->data != NULL)
{
@@ -64,9 +64,9 @@
/* Initialize a buffer structure which is not to be used for I/O. */
-struct buffer *
+BUFFER *
buf_nonio_initialize (memory)
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
return (buf_initialize
((int (*) PROTO((void *, char *, int, int, int *))) NULL,
@@ -82,7 +82,7 @@
static void
buf_default_memory_error (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
error (1, 0, "out of memory");
}
@@ -135,7 +135,7 @@
int
buf_empty_p (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
struct buffer_data *data;
@@ -153,7 +153,7 @@
int
buf_count_mem (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
struct buffer_data *data;
int mem = 0;
@@ -169,7 +169,7 @@
void
buf_output (buf, data, len)
- struct buffer *buf;
+ BUFFER *buf;
const char *data;
int len;
{
@@ -224,7 +224,7 @@
void
buf_output0 (buf, string)
- struct buffer *buf;
+ BUFFER *buf;
const char *string;
{
buf_output (buf, string, strlen (string));
@@ -234,7 +234,7 @@
void
buf_append_char (buf, ch)
- struct buffer *buf;
+ BUFFER *buf;
int ch;
{
if (buf->data != NULL
@@ -261,7 +261,7 @@
int
buf_send_output (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
if (buf->output == NULL)
abort ();
@@ -324,7 +324,7 @@
int
buf_flush (buf, block)
- struct buffer *buf;
+ BUFFER *buf;
int block;
{
int nonblocking;
@@ -364,7 +364,7 @@
int
set_nonblock (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
int status;
@@ -386,7 +386,7 @@
int
set_block (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
int status;
@@ -411,7 +411,7 @@
int
buf_send_counted (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
int size;
struct buffer_data *data;
@@ -451,7 +451,7 @@
int
buf_send_special_count (buf, count)
- struct buffer *buf;
+ BUFFER *buf;
int count;
{
struct buffer_data *data;
@@ -480,7 +480,7 @@
void
buf_append_data (buf, data, last)
- struct buffer *buf;
+ BUFFER *buf;
struct buffer_data *data;
struct buffer_data *last;
{
@@ -499,7 +499,7 @@
void
buf_append_buffer (to, from)
- struct buffer *to;
+ BUFFER *to;
struct buffer *from;
{
buf_append_data (to, from->data, from->last);
@@ -662,7 +662,7 @@
int
buf_length (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
return buf_chain_length (buf->data);
}
@@ -677,7 +677,7 @@
int
buf_input_data (buf, countp)
- struct buffer *buf;
+ BUFFER *buf;
int *countp;
{
if (buf->input == NULL)
@@ -752,7 +752,7 @@
int
buf_read_line (buf, line, lenp)
- struct buffer *buf;
+ BUFFER *buf;
char **line;
int *lenp;
{
@@ -889,7 +889,7 @@
int
buf_read_data (buf, want, retdata, got)
- struct buffer *buf;
+ BUFFER *buf;
int want;
char **retdata;
int *got;
@@ -964,8 +964,8 @@
void
buf_copy_lines (outbuf, inbuf, command)
- struct buffer *outbuf;
- struct buffer *inbuf;
+ BUFFER *outbuf;
+ BUFFER *inbuf;
int command;
{
while (1)
@@ -1048,8 +1048,8 @@
int
buf_copy_counted (outbuf, inbuf, special)
- struct buffer *outbuf;
- struct buffer *inbuf;
+ BUFFER *outbuf;
+ BUFFER *inbuf;
int *special;
{
*special = 0;
@@ -1195,7 +1195,7 @@
int
buf_shutdown (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
if (buf->shutdown)
return (*buf->shutdown) (buf->closure);
@@ -1213,11 +1213,11 @@
/* Initialize a buffer built on a stdio FILE. */
-struct buffer *
+BUFFER *
stdio_buffer_initialize (fp, input, memory)
FILE *fp;
int input;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
return buf_initialize (input ? stdio_buffer_input : NULL,
input ? NULL : stdio_buffer_output,
@@ -1359,7 +1359,7 @@
struct packetizing_buffer
{
/* The underlying buffer. */
- struct buffer *buf;
+ BUFFER *buf;
/* The input translation function. Exactly one of inpfn and outfn
will be NULL. The input translation function should
untranslate the data in INPUT, storing the result in OUTPUT.
@@ -1402,13 +1402,13 @@
/* Create a packetizing buffer. */
-struct buffer *
+BUFFER *
packetizing_buffer_initialize (buf, inpfn, outfn, fnclosure, memory)
- struct buffer *buf;
+ BUFFER *buf;
int (*inpfn) PROTO ((void *, const char *, char *, int));
int (*outfn) PROTO ((void *, const char *, char *, int, int *));
void *fnclosure;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
struct packetizing_buffer *pb;
diff -Naur --recursive cvs.orig/src/buffer.h cvs/src/buffer.h
--- cvs.orig/src/buffer.h Sat Jun 9 22:09:08 2001
+++ cvs/src/buffer.h Tue Jun 12 17:43:12 2001
@@ -10,7 +10,7 @@
* list of buffer_data structures to hold data.
*/
-struct buffer
+typedef struct buffer
{
/* Data. */
struct buffer_data *data;
@@ -68,7 +68,7 @@
/* Function to call if we can't allocate memory. */
void (*memory_error) PROTO((struct buffer *));
-};
+} BUFFER;
/* Data is stored in lists of these structures. */
@@ -97,56 +97,56 @@
#define BUFFER_DATA_SIZE (4096)
/* The type of a function passed as a memory error handler. */
-typedef void (*BUFMEMERRPROC) PROTO ((struct buffer *));
+typedef void (*BUFMEMERRPROC) PROTO ((BUFFER *));
-extern struct buffer *buf_initialize PROTO((int (*) (void *, char *, int,
+extern BUFFER *buf_initialize PROTO((int (*) (void *, char *, int,
int, int *),
int (*) (void *, const char *,
int, int *),
int (*) (void *),
int (*) (void *, int),
int (*) (void *),
- void (*) (struct buffer *),
+ void (*) (BUFFER *),
void *));
-extern void buf_free PROTO((struct buffer *));
-extern struct buffer *buf_nonio_initialize PROTO((void (*) (struct buffer *)));
-extern struct buffer *stdio_buffer_initialize
- PROTO((FILE *, int, void (*) (struct buffer *)));
-extern struct buffer *compress_buffer_initialize
- PROTO((struct buffer *, int, int, void (*) (struct buffer *)));
-extern struct buffer *packetizing_buffer_initialize
- PROTO((struct buffer *, int (*) (void *, const char *, char *, int),
+extern void buf_free PROTO((BUFFER *));
+extern BUFFER *buf_nonio_initialize PROTO((void (*) (BUFFER *)));
+extern BUFFER *stdio_buffer_initialize
+ PROTO((FILE *, int, void (*) (BUFFER *)));
+extern BUFFER *compress_buffer_initialize
+ PROTO((BUFFER*, int, int, void (*) (BUFFER *)));
+extern BUFFER *packetizing_buffer_initialize
+ PROTO((BUFFER*, int (*) (void *, const char *, char *, int),
int (*) (void *, const char *, char *, int, int *), void *,
- void (*) (struct buffer *)));
-extern int buf_empty_p PROTO((struct buffer *));
-extern void buf_output PROTO((struct buffer *, const char *, int));
-extern void buf_output0 PROTO((struct buffer *, const char *));
-extern void buf_append_char PROTO((struct buffer *, int));
-extern int buf_send_output PROTO((struct buffer *));
-extern int buf_flush PROTO((struct buffer *, int));
-extern int set_nonblock PROTO((struct buffer *));
-extern int set_block PROTO((struct buffer *));
-extern int buf_send_counted PROTO((struct buffer *));
-extern int buf_send_special_count PROTO((struct buffer *, int));
-extern void buf_append_data PROTO((struct buffer *,
+ void (*) (BUFFER *)));
+extern int buf_empty_p PROTO((BUFFER *));
+extern void buf_output PROTO((BUFFER *, const char *, int));
+extern void buf_output0 PROTO((BUFFER *, const char *));
+extern void buf_append_char PROTO((BUFFER *, int));
+extern int buf_send_output PROTO((BUFFER *));
+extern int buf_flush PROTO((BUFFER *, int));
+extern int set_nonblock PROTO((BUFFER *));
+extern int set_block PROTO((BUFFER *));
+extern int buf_send_counted PROTO((BUFFER *));
+extern int buf_send_special_count PROTO((BUFFER *, int));
+extern void buf_append_data PROTO((BUFFER *,
struct buffer_data *,
struct buffer_data *));
-extern void buf_append_buffer PROTO((struct buffer *, struct buffer *));
+extern void buf_append_buffer PROTO((BUFFER *, BUFFER *));
extern int buf_read_file PROTO((FILE *, long, struct buffer_data **,
struct buffer_data **));
extern int buf_read_file_to_eof PROTO((FILE *, struct buffer_data **,
struct buffer_data **));
-extern int buf_input_data PROTO((struct buffer *, int *));
-extern int buf_read_line PROTO((struct buffer *, char **, int *));
-extern int buf_read_data PROTO((struct buffer *, int, char **, int *));
-extern void buf_copy_lines PROTO((struct buffer *, struct buffer *, int));
-extern int buf_copy_counted PROTO((struct buffer *, struct buffer *, int *));
+extern int buf_input_data PROTO((BUFFER *, int *));
+extern int buf_read_line PROTO((BUFFER *, char **, int *));
+extern int buf_read_data PROTO((BUFFER *, int, char **, int *));
+extern void buf_copy_lines PROTO((BUFFER *, BUFFER *, int));
+extern int buf_copy_counted PROTO((BUFFER *, BUFFER *, int *));
extern int buf_chain_length PROTO((struct buffer_data *));
-extern int buf_length PROTO((struct buffer *));
-extern int buf_shutdown PROTO((struct buffer *));
+extern int buf_length PROTO((BUFFER *));
+extern int buf_shutdown PROTO((BUFFER *));
#ifdef SERVER_FLOWCONTROL
-extern int buf_count_mem PROTO((struct buffer *));
+extern int buf_count_mem PROTO((BUFFER *));
#endif /* SERVER_FLOWCONTROL */
#endif /* defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT) */
diff -Naur --recursive cvs.orig/src/checkin.c cvs/src/checkin.c
--- cvs.orig/src/checkin.c Sat Jun 9 22:09:03 2001
+++ cvs/src/checkin.c Tue Jun 12 17:43:12 2001
@@ -18,6 +18,7 @@
#include "cvs.h"
#include "fileattr.h"
#include "edit.h"
+#include "buffer.h"
int
Checkin (type, finfo, rcs, rev, tag, options, message)
@@ -167,7 +168,7 @@
/* Need to update the checked out file on the client side. */
server_updated (finfo, vers, SERVER_UPDATED,
(mode_t) -1, (unsigned char *) NULL,
- (struct buffer *) NULL);
+ (BUFFER *) NULL);
else
server_checked_in (finfo->file, finfo->update_dir,
finfo->repository);
}
diff -Naur --recursive cvs.orig/src/client.c cvs/src/client.c
--- cvs.orig/src/client.c Sat Jun 9 22:09:04 2001
+++ cvs/src/client.c Tue Jun 12 17:43:12 2001
@@ -437,12 +437,12 @@
static List *ignlist = (List *) NULL;
/* Buffer to write to the server. */
-static struct buffer *to_server;
+static BUFFER *to_server;
/* The stream underlying to_server, if we are using a stream. */
static FILE *to_server_fp;
/* Buffer used to read from the server. */
-static struct buffer *from_server;
+static BUFFER *from_server;
/* The stream underlying from_server, if we are using a stream. */
static FILE *from_server_fp;
@@ -459,13 +459,13 @@
struct log_buffer
{
/* The underlying buffer. */
- struct buffer *buf;
+ BUFFER *buf;
/* The file to log information to. */
FILE *log;
};
-static struct buffer *log_buffer_initialize
- PROTO((struct buffer *, FILE *, int, void (*) (struct buffer *)));
+static BUFFER *log_buffer_initialize
+ PROTO((BUFFER *, FILE *, int, void (*) (BUFFER *)));
static int log_buffer_input PROTO((void *, char *, int, int, int *));
static int log_buffer_output PROTO((void *, const char *, int, int *));
static int log_buffer_flush PROTO((void *));
@@ -474,12 +474,12 @@
/* Create a log buffer. */
-static struct buffer *
+static BUFFER *
log_buffer_initialize (buf, fp, input, memory)
- struct buffer *buf;
+ BUFFER *buf;
FILE *fp;
int input;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
struct log_buffer *n;
@@ -639,19 +639,19 @@
int socket;
};
-static struct buffer *socket_buffer_initialize
- PROTO ((int, int, void (*) (struct buffer *)));
+static BUFFER *socket_buffer_initialize
+ PROTO ((int, int, void (*) (BUFFER *)));
static int socket_buffer_input PROTO((void *, char *, int, int, int *));
static int socket_buffer_output PROTO((void *, const char *, int, int *));
static int socket_buffer_flush PROTO((void *));
/* Create a buffer based on a socket. */
-static struct buffer *
+static BUFFER *
socket_buffer_initialize (socket, input, memory)
int socket;
int input;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
struct socket_buffer *n;
diff -Naur --recursive cvs.orig/src/client.h cvs/src/client.h
--- cvs.orig/src/client.h Sat Jun 9 22:09:08 2001
+++ cvs/src/client.h Tue Jun 12 17:43:12 2001
@@ -21,7 +21,7 @@
/* We can't declare the arguments without including krb.h, and I don't
want to do that in every file. */
-extern struct buffer *krb_encrypt_buffer_initialize ();
+extern BUFFER *krb_encrypt_buffer_initialize ();
#endif /* HAVE_KERBEROS */
@@ -38,7 +38,7 @@
/* We can't declare the arguments without including gssapi.h, and I
don't want to do that in every file. */
-extern struct buffer *cvs_gssapi_wrap_buffer_initialize ();
+extern BUFFER *cvs_gssapi_wrap_buffer_initialize ();
#endif /* HAVE_GSSAPI */
diff -Naur --recursive cvs.orig/src/commit.c cvs/src/commit.c
--- cvs.orig/src/commit.c Sat Jun 9 22:09:04 2001
+++ cvs/src/commit.c Tue Jun 12 17:43:12 2001
@@ -20,6 +20,7 @@
#include "edit.h"
#include "fileattr.h"
#include "hardlink.h"
+#include "buffer.h"
static Dtype check_direntproc PROTO ((void *callerdat, char *dir,
char *repos, char *update_dir,
@@ -1346,7 +1347,7 @@
(mode_t) -1,
(unsigned char *) NULL,
- (struct buffer *) NULL);
+ (BUFFER *) NULL);
}
#endif
}
diff -Naur --recursive cvs.orig/src/server.c cvs/src/server.c
--- cvs.orig/src/server.c Sat Jun 9 22:09:07 2001
+++ cvs/src/server.c Tue Jun 12 17:43:12 2001
@@ -121,10 +121,10 @@
/* While processing requests, this buffer accumulates data to be sent to
the client, and then once we are in do_cvs_command, we use it
for all the data to be sent. */
-static struct buffer *buf_to_net;
+static BUFFER *buf_to_net;
/* This buffer is used to read input from the client. */
-static struct buffer *buf_from_net;
+static BUFFER *buf_from_net;
/*
* This is where we stash stuff we are going to use. Format string
@@ -153,8 +153,8 @@
int blocking;
};
-static struct buffer *fd_buffer_initialize
- PROTO ((int, int, void (*) (struct buffer *)));
+static BUFFER *fd_buffer_initialize
+ PROTO ((int, int, void (*) (BUFFER *)));
static int fd_buffer_input PROTO((void *, char *, int, int, int *));
static int fd_buffer_output PROTO((void *, const char *, int, int *));
static int fd_buffer_flush PROTO((void *));
@@ -166,11 +166,11 @@
for output. MEMORY is the function to call when a memory error
occurs. */
-static struct buffer *
+static BUFFER *
fd_buffer_initialize (fd, input, memory)
int fd;
int input;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
struct fd_buffer *n;
@@ -2375,18 +2375,18 @@
ign_case = 1;
}
-static struct buffer *protocol;
+static BUFFER *protocol;
/* This is the output which we are saving up to send to the server, in the
child process. We will push it through, via the `protocol' buffer, when
we have a complete line. */
-static struct buffer *saved_output;
+static BUFFER *saved_output;
/* Likewise, but stuff which will go to stderr. */
-static struct buffer *saved_outerr;
+static BUFFER *saved_outerr;
static void
protocol_memory_error (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
error (1, ENOMEM, "Virtual memory exhausted");
}
@@ -2399,7 +2399,7 @@
static void
outbuf_memory_error (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
static const char msg[] = "E Fatal server error\n\
error ENOMEM Virtual memory exhausted.\n";
@@ -2422,7 +2422,7 @@
static void
input_memory_error (buf)
- struct buffer *buf;
+ BUFFER *buf;
{
outbuf_memory_error (buf);
}
@@ -2815,9 +2815,9 @@
/* OK, sit around getting all the input from the child. */
{
- struct buffer *stdoutbuf;
- struct buffer *stderrbuf;
- struct buffer *protocol_inbuf;
+ BUFFER *stdoutbuf;
+ BUFFER *stderrbuf;
+ BUFFER *protocol_inbuf;
/* Number of file descriptors to check in select (). */
int num_to_check;
int count_needed = 1;
@@ -3952,7 +3952,7 @@
enum server_updated_arg4 updated,
mode_t mode,
unsigned char *checksum,
- struct buffer *filebuf)
+ BUFFER *filebuf)
#else
void
server_updated (finfo, vers, updated, mode, checksum, filebuf)
@@ -3961,7 +3961,7 @@
enum server_updated_arg4 updated;
mode_t mode;
unsigned char *checksum;
- struct buffer *filebuf;
+ BUFFER *filebuf;
#endif
{
if (noexec)
@@ -6094,12 +6094,12 @@
/* Create a GSSAPI wrapping buffer. We use a packetizing buffer with
GSSAPI wrapping routines. */
-struct buffer *
+BUFFER *
cvs_gssapi_wrap_buffer_initialize (buf, input, gcontext, memory)
- struct buffer *buf;
+ BUFFER *buf;
int input;
gss_ctx_id_t gcontext;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
struct cvs_gssapi_wrap_data *gd;
@@ -6223,13 +6223,13 @@
/* Create a Kerberos encryption buffer. We use a packetizing buffer
with Kerberos encryption translation routines. */
-struct buffer *
+BUFFER *
krb_encrypt_buffer_initialize (buf, input, sched, block, memory)
- struct buffer *buf;
+ BUFFER *buf;
int input;
Key_schedule sched;
C_Block block;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
struct krb_encrypt_data *kd;
@@ -6373,7 +6373,7 @@
#ifdef SERVER_SUPPORT
if (error_use_protocol || server_active)
{
- struct buffer *buf;
+ BUFFER *buf;
char size_text[40];
if (error_use_protocol)
@@ -6583,7 +6583,7 @@
#ifdef SERVER_SUPPORT
if (server_active && supported_response ("MT"))
{
- struct buffer *buf;
+ BUFFER *buf;
if (error_use_protocol)
buf = buf_to_net;
diff -Naur --recursive cvs.orig/src/update.c cvs/src/update.c
--- cvs.orig/src/update.c Sat Jun 9 22:09:08 2001
+++ cvs/src/update.c Tue Jun 12 17:43:12 2001
@@ -757,7 +757,7 @@
? SERVER_RCS_DIFF
: SERVER_PATCHED),
file_info.st_mode, checksum,
- (struct buffer *) NULL);
+ (BUFFER *) NULL);
break;
}
}
@@ -1244,7 +1244,7 @@
server_updated (finfo, vers,
SERVER_UPDATED, (mode_t) -1,
(unsigned char *) NULL,
- (struct buffer *) NULL);
+ (BUFFER *) NULL);
}
#endif
if (unlink_file (finfo->file) < 0 && ! existence_error (errno))
@@ -1288,7 +1288,7 @@
int set_time, retval = 0;
int status;
int file_is_dead;
- struct buffer *revbuf;
+ BUFFER *revbuf;
backup = NULL;
revbuf = NULL;
@@ -1567,7 +1567,7 @@
const char *data;
size_t len;
{
- struct buffer *buf = (struct buffer *) callerdat;
+ BUFFER *buf = (BUFFER *) callerdat;
buf_output (buf, data, len);
}
@@ -2068,7 +2068,7 @@
backup);
server_updated (finfo, vers, SERVER_MERGED,
(mode_t) -1, (unsigned char *) NULL,
- (struct buffer *) NULL);
+ (BUFFER *) NULL);
}
#endif
@@ -2327,7 +2327,7 @@
{
server_scratch (finfo->file);
server_updated (finfo, vers, SERVER_UPDATED, (mode_t) -1,
- (unsigned char *) NULL, (struct buffer *) NULL);
+ (unsigned char *) NULL, (BUFFER *) NULL);
}
#endif
Register (finfo->entries, finfo->file, mrev, vers->ts_rcs,
@@ -2609,7 +2609,7 @@
backup);
server_updated (finfo, vers, SERVER_MERGED,
(mode_t) -1, (unsigned char *) NULL,
- (struct buffer *) NULL);
+ (BUFFER *) NULL);
}
#endif
free (backup);
diff -Naur --recursive cvs.orig/src/zlib.c cvs/src/zlib.c
--- cvs.orig/src/zlib.c Sat Jun 9 22:09:08 2001
+++ cvs/src/zlib.c Tue Jun 12 17:43:13 2001
@@ -41,7 +41,7 @@
struct compress_buffer
{
/* The underlying buffer. */
- struct buffer *buf;
+ BUFFER *buf;
/* The compression information. */
z_stream zstr;
};
@@ -83,12 +83,12 @@
/* Create a compression buffer. */
-struct buffer *
+BUFFER *
compress_buffer_initialize (buf, input, level, memory)
- struct buffer *buf;
+ BUFFER *buf;
int input;
int level;
- void (*memory) PROTO((struct buffer *));
+ void (*memory) PROTO((BUFFER *));
{
struct compress_buffer *n;
int zstatus;