[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] use from_/to_server_p vs from_/to_server consistently
From: |
Alexey Mahotkin |
Subject: |
[PATCH] use from_/to_server_p vs from_/to_server consistently |
Date: |
Fri, 02 May 2003 01:45:21 +0400 |
User-agent: |
Gnus/5.090006 (Oort Gnus v0.06) XEmacs/21.4 (Common Lisp, i386-debian-linux) |
Arguments of make_bufs_from_fd() are called from_/to_server, while
they are actually used as pointers to from_/to_server variables;
same goes for connect_to_forked_server() and start_tcp_server();
also, make connect_to_forked_server() static;
That is, calls of make_bufs_from_fds must take either
&to_server, &from_server,
or
to_server_p, from_server_p,
as arguments, and not "to_server, from_server", as it sometimes used to be.
src/client.c | 37 +++++++++++++++++--------------------
src/client.h | 4 ++--
src/rsh-client.c | 16 ++++++++--------
3 files changed, 27 insertions(+), 30 deletions(-)
--- ccvs/src/client.c~from-to-server-p Fri May 2 01:20:59 2003
+++ ccvs-alexm/src/client.c Fri May 2 01:25:52 2003
@@ -3368,12 +3368,12 @@ get_cvs_port_number (root)
void
-make_bufs_from_fds (tofd, fromfd, child_pid, to_server, from_server, is_sock)
+make_bufs_from_fds (tofd, fromfd, child_pid, to_server_p, from_server_p,
is_sock)
int tofd;
int fromfd;
int child_pid;
- struct buffer **to_server;
- struct buffer **from_server;
+ struct buffer **to_server_p;
+ struct buffer **from_server_p;
int is_sock;
{
FILE *to_server_fp;
@@ -3383,9 +3383,9 @@ make_bufs_from_fds (tofd, fromfd, child_
if (is_sock)
{
assert (tofd == fromfd);
- *to_server = socket_buffer_initialize (tofd, 0,
+ *to_server_p = socket_buffer_initialize (tofd, 0,
(BUFMEMERRPROC) NULL);
- *from_server = socket_buffer_initialize (tofd, 1,
+ *from_server_p = socket_buffer_initialize (tofd, 1,
(BUFMEMERRPROC) NULL);
}
else
@@ -3414,13 +3414,13 @@ make_bufs_from_fds (tofd, fromfd, child_
to_server_fp = fdopen (tofd, FOPEN_BINARY_WRITE);
if (to_server_fp == NULL)
error (1, errno, "cannot fdopen %d for write", tofd);
- *to_server = stdio_buffer_initialize (to_server_fp, 0, 0,
+ *to_server_p = stdio_buffer_initialize (to_server_fp, 0, 0,
(BUFMEMERRPROC) NULL);
from_server_fp = fdopen (fromfd, FOPEN_BINARY_READ);
if (from_server_fp == NULL)
error (1, errno, "cannot fdopen %d for read", fromfd);
- *from_server = stdio_buffer_initialize (from_server_fp, child_pid, 1,
+ *from_server_p = stdio_buffer_initialize (from_server_fp, child_pid, 1,
(BUFMEMERRPROC) NULL);
}
}
@@ -3685,16 +3685,13 @@ auth_server (root, lto_server, lfrom_ser
#ifdef CLIENT_SUPPORT
-/* void
- * connect_to_forked_server ( struct buffer **to_server,
- * struct buffer **from_server )
- *
+/*
* Connect to a forked server process.
*/
-void
-connect_to_forked_server (to_server, from_server)
- struct buffer **to_server;
- struct buffer **from_server;
+static void
+connect_to_forked_server (to_server_p, from_server_p)
+ struct buffer **to_server_p;
+ struct buffer **from_server_p;
{
int tofd, fromfd;
int child_pid;
@@ -3720,7 +3717,7 @@ connect_to_forked_server (to_server, fro
if (child_pid < 0)
error (1, 0, "could not fork server process");
- make_bufs_from_fds (tofd, fromfd, child_pid, to_server, from_server, 0);
+ make_bufs_from_fds (tofd, fromfd, child_pid, to_server_p, from_server_p,
0);
}
#endif /* CLIENT_SUPPORT */
@@ -3733,10 +3730,10 @@ connect_to_forked_server (to_server, fro
on such a system (OS/2, Windows 95, and maybe others) will have to
take care of this. */
void
-start_tcp_server (root, to_server, from_server)
+start_tcp_server (root, to_server_p, from_server_p)
cvsroot_t *root;
- struct buffer **to_server;
- struct buffer **from_server;
+ struct buffer **to_server_p;
+ struct buffer **from_server_p;
{
int s;
const char *portenv;
@@ -3797,7 +3794,7 @@ start_tcp_server (root, to_server, from_
free (hname);
/* Give caller the values it wants. */
- make_bufs_from_fds (s, s, 0, to_server, from_server, 1);
+ make_bufs_from_fds (s, s, 0, to_server_p, from_server_p, 1);
}
#endif /* HAVE_KERBEROS */
--- ccvs/src/client.h~from-to-server-p Fri May 2 01:21:54 2003
+++ ccvs-alexm/src/client.h Fri May 2 01:22:01 2003
@@ -14,8 +14,8 @@ struct buffer;
void make_bufs_from_fds PROTO((int tofd,
int fromfd,
int child_pid,
- struct buffer **to_server,
- struct buffer **from_server,
+ struct buffer **to_server_p,
+ struct buffer **from_server_p,
int is_sock));
--- ccvs/src/rsh-client.c~from-to-server-p Fri May 2 01:26:38 2003
+++ ccvs-alexm/src/rsh-client.c Fri May 2 01:28:00 2003
@@ -35,10 +35,10 @@
up and running, and that's most important. */
void
-start_rsh_server (root, to_server, from_server)
+start_rsh_server (root, to_server_p, from_server_p)
cvsroot_t *root;
- struct buffer **to_server;
- struct buffer **from_server;
+ struct buffer **to_server_p;
+ struct buffer **from_server_p;
{
int pipes[2];
int child_pid;
@@ -114,16 +114,16 @@ start_rsh_server (root, to_server, from_
error (1, errno, "cannot start server via rsh");
/* Give caller the file descriptors in a form it can deal with. */
- make_bufs_from_fds (pipes[0], pipes[1], child_pid, to_server, from_server,
0);
+ make_bufs_from_fds (pipes[0], pipes[1], child_pid, to_server_p,
from_server_p, 0);
}
# else /* ! START_RSH_WITH_POPEN_RW */
void
-start_rsh_server (root, to_server, from_server)
+start_rsh_server (root, to_server_p, from_server_p)
cvsroot_t *root;
- struct buffer **to_server;
- struct buffer **from_server;
+ struct buffer **to_server_p;
+ struct buffer **from_server_p;
{
/* If you're working through firewalls, you can set the
CVS_RSH environment variable to a script which uses rsh to
@@ -186,7 +186,7 @@ start_rsh_server (root, to_server, from_
}
free (command);
- make_bufs_from_fds (tofd, fromfd, child_pid, to_server, from_server, 0);
+ make_bufs_from_fds (tofd, fromfd, child_pid, to_server_p, from_server_p,
0);
}
# endif /* START_RSH_WITH_POPEN_RW */
_
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] use from_/to_server_p vs from_/to_server consistently,
Alexey Mahotkin <=