diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 292cf3730e49da7189a411a62115c93a0226251c..c090480ab8f7779a973fa60f5ce0d7c5983fb7d0 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.8 1997/10/25 01:09:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.9 1997/11/10 05:15:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -241,7 +241,7 @@ strmake(char *str, int len)
len = strlen(str);
newstr = (char *) palloc((unsigned) len + 1);
- StrNCpy(newstr, str, len+1);
+ StrNCpy(newstr, str, len + 1);
newstr[len] = (char) 0;
return newstr;
}
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index e78569ae2ac0cf140db830364c0cbf889ef7cee0..02bea1ad78a32c683770031299f2184d87dfc836 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.23 1997/11/07 20:51:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.24 1997/11/10 05:15:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -907,10 +907,10 @@ hba_recvauth(const Port *port, const char database[], const char user[],
int retvalue;
/* UNIX socket always OK, for now */
- if(port->raddr.in.sin_family == AF_UNIX)
- return STATUS_OK;
+ if (port->raddr.in.sin_family == AF_UNIX)
+ return STATUS_OK;
/* Our eventual return value */
-
+
find_hba_entry(DataDir, port->raddr.in.sin_addr, database,
&host_ok, &userauth, usermap_name,
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 7e8cab0afefba7af7b1b642a01ae2fd04ba8cd82..d397eb8c8faf4f03b6ac578cb2592bab95445703 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.10 1997/10/25 01:09:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.11 1997/11/10 05:15:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -154,7 +154,7 @@ PQpnames(char **pnames, int rule_p)
{
if (!rule_p || portals[i]->portal->rule_p)
{
- strncpy(pnames[cur_pname], portals[i]->name, PortalNameLength+1);
+ strncpy(pnames[cur_pname], portals[i]->name, PortalNameLength + 1);
++cur_pname;
}
}
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index c3223bf82f95708e192b793459f2ccfa528e0e0a..3c3807573f7187bb8db00b1662a1bb4347fdccb0 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.25 1997/11/10 02:21:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.26 1997/11/10 05:15:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -574,20 +574,25 @@ pq_async_notify()
static char sock_path[100] = "";
-static void do_unlink()
+static void
+do_unlink()
{
- if (sock_path[0]) unlink(sock_path);
+ if (sock_path[0])
+ unlink(sock_path);
}
int
StreamServerPort(char *hostName, short portName, int *fdP)
{
- union {
- struct sockaddr_in in;
- struct sockaddr_un un;
- } saddr;
- int fd, err, family;
- size_t len;
+ union
+ {
+ struct sockaddr_in in;
+ struct sockaddr_un un;
+ } saddr;
+ int fd,
+ err,
+ family;
+ size_t len;
int one = 1;
family = hostName != NULL ? AF_INET : AF_UNIX;
@@ -601,7 +606,8 @@ StreamServerPort(char *hostName, short portName, int *fdP)
pqdebug("%s", PQerrormsg);
return (STATUS_ERROR);
}
- if (family == AF_UNIX) on_exitpg(do_unlink, (caddr_t) 0);
+ if (family == AF_UNIX)
+ on_exitpg(do_unlink, (caddr_t) 0);
if ((setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &one,
sizeof(one))) == -1)
{
@@ -614,19 +620,19 @@ StreamServerPort(char *hostName, short portName, int *fdP)
}
bzero(&saddr, sizeof(saddr));
if (family == AF_UNIX)
- {
- saddr.un.sun_family = family;
- len = UNIXSOCK_PATH(saddr.un,portName);
- strcpy(sock_path, saddr.un.sun_path);
- }
+ {
+ saddr.un.sun_family = family;
+ len = UNIXSOCK_PATH(saddr.un, portName);
+ strcpy(sock_path, saddr.un.sun_path);
+ }
else
- {
- saddr.in.sin_family = family;
- saddr.in.sin_addr.s_addr = htonl(INADDR_ANY);
- saddr.in.sin_port = htons(portName);
- len = sizeof saddr.in;
- }
- err = bind(fd, (struct sockaddr *) &saddr, len);
+ {
+ saddr.in.sin_family = family;
+ saddr.in.sin_addr.s_addr = htonl(INADDR_ANY);
+ saddr.in.sin_port = htons(portName);
+ len = sizeof saddr.in;
+ }
+ err = bind(fd, (struct sockaddr *) & saddr, len);
if (err < 0)
{
sprintf(PQerrormsg,
@@ -664,21 +670,22 @@ StreamServerPort(char *hostName, short portName, int *fdP)
int
StreamConnection(int server_fd, Port *port)
{
- int len, addrlen;
- int family = port->raddr.in.sin_family;
+ int len,
+ addrlen;
+ int family = port->raddr.in.sin_family;
/* accept connection (and fill in the client (remote) address) */
len = family == AF_INET ?
- sizeof(struct sockaddr_in) : sizeof(struct sockaddr_un);
+ sizeof(struct sockaddr_in) : sizeof(struct sockaddr_un);
addrlen = len;
if ((port->sock = accept(server_fd,
- (struct sockaddr *) & port->raddr,
- &addrlen)) < 0)
+ (struct sockaddr *) & port->raddr,
+ &addrlen)) < 0)
{
elog(WARN, "postmaster: StreamConnection: accept: %m");
return (STATUS_ERROR);
}
-
+
/* fill in the server (local) address */
addrlen = len;
if (getsockname(port->sock, (struct sockaddr *) & port->laddr,
@@ -737,50 +744,51 @@ StreamClose(int sock)
int
StreamOpen(char *hostName, short portName, Port *port)
{
- int len, err;
+ int len,
+ err;
struct hostent *hp;
extern int errno;
-
+
/* set up the server (remote) address */
MemSet((char *) &port->raddr, 0, sizeof(port->raddr));
if (hostName)
- {
- if (!(hp = gethostbyname(hostName)) || hp->h_addrtype != AF_INET)
- {
- sprintf(PQerrormsg,
- "FATAL: StreamOpen: unknown hostname: %s\n",
- hostName);
- fputs(PQerrormsg, stderr);
- pqdebug("%s", PQerrormsg);
- return (STATUS_ERROR);
- }
- memmove((char *) &(port->raddr.in.sin_addr),
- (char *) hp->h_addr,
- hp->h_length);
- port->raddr.in.sin_family = AF_INET;
- port->raddr.in.sin_port = htons(portName);
- len = sizeof(struct sockaddr_in);
- }
+ {
+ if (!(hp = gethostbyname(hostName)) || hp->h_addrtype != AF_INET)
+ {
+ sprintf(PQerrormsg,
+ "FATAL: StreamOpen: unknown hostname: %s\n",
+ hostName);
+ fputs(PQerrormsg, stderr);
+ pqdebug("%s", PQerrormsg);
+ return (STATUS_ERROR);
+ }
+ memmove((char *) &(port->raddr.in.sin_addr),
+ (char *) hp->h_addr,
+ hp->h_length);
+ port->raddr.in.sin_family = AF_INET;
+ port->raddr.in.sin_port = htons(portName);
+ len = sizeof(struct sockaddr_in);
+ }
else
- {
- port->raddr.un.sun_family = AF_UNIX;
- len = UNIXSOCK_PATH(port->raddr.un,portName);
- }
+ {
+ port->raddr.un.sun_family = AF_UNIX;
+ len = UNIXSOCK_PATH(port->raddr.un, portName);
+ }
/* connect to the server */
- if ((port->sock=socket(port->raddr.in.sin_family, SOCK_STREAM, 0)) < 0)
+ if ((port->sock = socket(port->raddr.in.sin_family, SOCK_STREAM, 0)) < 0)
{
sprintf(PQerrormsg,
- "FATAL: StreamOpen: socket() failed: errno=%d\n",
+ "FATAL: StreamOpen: socket() failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
return (STATUS_ERROR);
}
- err = connect(port->sock, (struct sockaddr*) &port->raddr, len);
+ err = connect(port->sock, (struct sockaddr *) & port->raddr, len);
if (err < 0)
{
sprintf(PQerrormsg,
- "FATAL: StreamOpen: connect() failed: errno=%d\n",
+ "FATAL: StreamOpen: connect() failed: errno=%d\n",
errno);
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
@@ -789,7 +797,7 @@ StreamOpen(char *hostName, short portName, Port *port)
/* fill in the client address */
if (getsockname(port->sock, (struct sockaddr *) & port->laddr,
- &len) < 0)
+ &len) < 0)
{
sprintf(PQerrormsg,
"FATAL: StreamOpen: getsockname() failed: errno=%d\n",
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index d699f00d0f1170377cdb255ff412e2936f83978f..6774885c36e02917372b4060ad9da1dba3139acc 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.9 1997/11/07 20:51:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.10 1997/11/10 05:16:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -85,9 +85,9 @@ PacketReceive(Port *port, /* receive port */
/*
* Assume port->nBytes is zero unless we were interrupted during
- * non-blocking I/O. This first recv() is to get the hdr
- * information so we know how many bytes to read. Life would be very
- * complicated if we read too much data (buffering).
+ * non-blocking I/O. This first recv() is to get the hdr information
+ * so we know how many bytes to read. Life would be very complicated
+ * if we read too much data (buffering).
*/
tmp = ((Addr) buf) + port->nBytes;
@@ -227,7 +227,7 @@ PacketSend(Port *port,
Assert(!nonBlocking);
Assert(buf);
- doneLen = write(port->sock, buf, len);
+ doneLen = write(port->sock, buf, len);
if (doneLen < len)
{
sprintf(PQerrormsg,