Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit725bbde

Browse files
committed
Clean up indenting.
1 parentbaeb879 commit725bbde

File tree

5 files changed

+77
-69
lines changed

5 files changed

+77
-69
lines changed

‎src/backend/libpq/be-pqexec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.8 1997/10/25 01:09:18 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.9 1997/11/10 05:15:49 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -241,7 +241,7 @@ strmake(char *str, int len)
241241
len=strlen(str);
242242

243243
newstr= (char*)palloc((unsigned)len+1);
244-
StrNCpy(newstr,str,len+1);
244+
StrNCpy(newstr,str,len+1);
245245
newstr[len]= (char)0;
246246
returnnewstr;
247247
}

‎src/backend/libpq/hba.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.23 1997/11/07 20:51:27 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.24 1997/11/10 05:15:52 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -907,10 +907,10 @@ hba_recvauth(const Port *port, const char database[], const char user[],
907907
intretvalue;
908908

909909
/* UNIX socket always OK, for now */
910-
if(port->raddr.in.sin_family==AF_UNIX)
911-
returnSTATUS_OK;
910+
if(port->raddr.in.sin_family==AF_UNIX)
911+
returnSTATUS_OK;
912912
/* Our eventual return value */
913-
913+
914914

915915
find_hba_entry(DataDir,port->raddr.in.sin_addr,database,
916916
&host_ok,&userauth,usermap_name,

‎src/backend/libpq/portal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.10 1997/10/25 01:09:21 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.11 1997/11/10 05:15:54 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -154,7 +154,7 @@ PQpnames(char **pnames, int rule_p)
154154
{
155155
if (!rule_p||portals[i]->portal->rule_p)
156156
{
157-
strncpy(pnames[cur_pname],portals[i]->name,PortalNameLength+1);
157+
strncpy(pnames[cur_pname],portals[i]->name,PortalNameLength+1);
158158
++cur_pname;
159159
}
160160
}

‎src/backend/libpq/pqcomm.c

Lines changed: 64 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.25 1997/11/1002:21:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.26 1997/11/1005:15:56 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -574,20 +574,25 @@ pq_async_notify()
574574

575575
staticcharsock_path[100]="";
576576

577-
staticvoiddo_unlink()
577+
staticvoid
578+
do_unlink()
578579
{
579-
if (sock_path[0])unlink(sock_path);
580+
if (sock_path[0])
581+
unlink(sock_path);
580582
}
581583

582584
int
583585
StreamServerPort(char*hostName,shortportName,int*fdP)
584586
{
585-
union {
586-
structsockaddr_inin;
587-
structsockaddr_unun;
588-
}saddr;
589-
intfd,err,family;
590-
size_tlen;
587+
union
588+
{
589+
structsockaddr_inin;
590+
structsockaddr_unun;
591+
}saddr;
592+
intfd,
593+
err,
594+
family;
595+
size_tlen;
591596
intone=1;
592597

593598
family=hostName!=NULL ?AF_INET :AF_UNIX;
@@ -601,7 +606,8 @@ StreamServerPort(char *hostName, short portName, int *fdP)
601606
pqdebug("%s",PQerrormsg);
602607
return (STATUS_ERROR);
603608
}
604-
if (family==AF_UNIX)on_exitpg(do_unlink, (caddr_t)0);
609+
if (family==AF_UNIX)
610+
on_exitpg(do_unlink, (caddr_t)0);
605611
if ((setsockopt(fd,SOL_SOCKET,SO_REUSEADDR, (char*)&one,
606612
sizeof(one)))==-1)
607613
{
@@ -614,19 +620,19 @@ StreamServerPort(char *hostName, short portName, int *fdP)
614620
}
615621
bzero(&saddr,sizeof(saddr));
616622
if (family==AF_UNIX)
617-
{
618-
saddr.un.sun_family=family;
619-
len=UNIXSOCK_PATH(saddr.un,portName);
620-
strcpy(sock_path,saddr.un.sun_path);
621-
}
623+
{
624+
saddr.un.sun_family=family;
625+
len=UNIXSOCK_PATH(saddr.un,portName);
626+
strcpy(sock_path,saddr.un.sun_path);
627+
}
622628
else
623-
{
624-
saddr.in.sin_family=family;
625-
saddr.in.sin_addr.s_addr=htonl(INADDR_ANY);
626-
saddr.in.sin_port=htons(portName);
627-
len=sizeofsaddr.in;
628-
}
629-
err=bind(fd, (structsockaddr*)&saddr,len);
629+
{
630+
saddr.in.sin_family=family;
631+
saddr.in.sin_addr.s_addr=htonl(INADDR_ANY);
632+
saddr.in.sin_port=htons(portName);
633+
len=sizeofsaddr.in;
634+
}
635+
err=bind(fd, (structsockaddr*)&saddr,len);
630636
if (err<0)
631637
{
632638
sprintf(PQerrormsg,
@@ -664,21 +670,22 @@ StreamServerPort(char *hostName, short portName, int *fdP)
664670
int
665671
StreamConnection(intserver_fd,Port*port)
666672
{
667-
intlen,addrlen;
668-
intfamily=port->raddr.in.sin_family;
673+
intlen,
674+
addrlen;
675+
intfamily=port->raddr.in.sin_family;
669676

670677
/* accept connection (and fill in the client (remote) address) */
671678
len=family==AF_INET ?
672-
sizeof(structsockaddr_in) :sizeof(structsockaddr_un);
679+
sizeof(structsockaddr_in) :sizeof(structsockaddr_un);
673680
addrlen=len;
674681
if ((port->sock=accept(server_fd,
675-
(structsockaddr*)&port->raddr,
676-
&addrlen))<0)
682+
(structsockaddr*)&port->raddr,
683+
&addrlen))<0)
677684
{
678685
elog(WARN,"postmaster: StreamConnection: accept: %m");
679686
return (STATUS_ERROR);
680687
}
681-
688+
682689
/* fill in the server (local) address */
683690
addrlen=len;
684691
if (getsockname(port->sock, (structsockaddr*)&port->laddr,
@@ -737,50 +744,51 @@ StreamClose(int sock)
737744
int
738745
StreamOpen(char*hostName,shortportName,Port*port)
739746
{
740-
intlen,err;
747+
intlen,
748+
err;
741749
structhostent*hp;
742750
externinterrno;
743-
751+
744752
/* set up the server (remote) address */
745753
MemSet((char*)&port->raddr,0,sizeof(port->raddr));
746754
if (hostName)
747-
{
748-
if (!(hp=gethostbyname(hostName))||hp->h_addrtype!=AF_INET)
749-
{
750-
sprintf(PQerrormsg,
751-
"FATAL: StreamOpen: unknown hostname: %s\n",
752-
hostName);
753-
fputs(PQerrormsg,stderr);
754-
pqdebug("%s",PQerrormsg);
755-
return (STATUS_ERROR);
756-
}
757-
memmove((char*)&(port->raddr.in.sin_addr),
758-
(char*)hp->h_addr,
759-
hp->h_length);
760-
port->raddr.in.sin_family=AF_INET;
761-
port->raddr.in.sin_port=htons(portName);
762-
len=sizeof(structsockaddr_in);
763-
}
755+
{
756+
if (!(hp=gethostbyname(hostName))||hp->h_addrtype!=AF_INET)
757+
{
758+
sprintf(PQerrormsg,
759+
"FATAL: StreamOpen: unknown hostname: %s\n",
760+
hostName);
761+
fputs(PQerrormsg,stderr);
762+
pqdebug("%s",PQerrormsg);
763+
return (STATUS_ERROR);
764+
}
765+
memmove((char*)&(port->raddr.in.sin_addr),
766+
(char*)hp->h_addr,
767+
hp->h_length);
768+
port->raddr.in.sin_family=AF_INET;
769+
port->raddr.in.sin_port=htons(portName);
770+
len=sizeof(structsockaddr_in);
771+
}
764772
else
765-
{
766-
port->raddr.un.sun_family=AF_UNIX;
767-
len=UNIXSOCK_PATH(port->raddr.un,portName);
768-
}
773+
{
774+
port->raddr.un.sun_family=AF_UNIX;
775+
len=UNIXSOCK_PATH(port->raddr.un,portName);
776+
}
769777
/* connect to the server */
770-
if ((port->sock=socket(port->raddr.in.sin_family,SOCK_STREAM,0))<0)
778+
if ((port->sock=socket(port->raddr.in.sin_family,SOCK_STREAM,0))<0)
771779
{
772780
sprintf(PQerrormsg,
773-
"FATAL: StreamOpen: socket() failed: errno=%d\n",
781+
"FATAL: StreamOpen: socket() failed: errno=%d\n",
774782
errno);
775783
fputs(PQerrormsg,stderr);
776784
pqdebug("%s",PQerrormsg);
777785
return (STATUS_ERROR);
778786
}
779-
err=connect(port->sock, (structsockaddr*)&port->raddr,len);
787+
err=connect(port->sock, (structsockaddr*)&port->raddr,len);
780788
if (err<0)
781789
{
782790
sprintf(PQerrormsg,
783-
"FATAL: StreamOpen: connect() failed: errno=%d\n",
791+
"FATAL: StreamOpen: connect() failed: errno=%d\n",
784792
errno);
785793
fputs(PQerrormsg,stderr);
786794
pqdebug("%s",PQerrormsg);
@@ -789,7 +797,7 @@ StreamOpen(char *hostName, short portName, Port *port)
789797

790798
/* fill in the client address */
791799
if (getsockname(port->sock, (structsockaddr*)&port->laddr,
792-
&len)<0)
800+
&len)<0)
793801
{
794802
sprintf(PQerrormsg,
795803
"FATAL: StreamOpen: getsockname() failed: errno=%d\n",

‎src/backend/libpq/pqpacket.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.9 1997/11/07 20:51:36 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.10 1997/11/10 05:16:00 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -85,9 +85,9 @@ PacketReceive(Port *port,/* receive port */
8585

8686
/*
8787
* Assume port->nBytes is zero unless we were interrupted during
88-
* non-blocking I/O. This first recv() is to get the hdr
89-
*informationso we know how many bytes to read. Life would be very
90-
*complicatedif we read too much data (buffering).
88+
* non-blocking I/O. This first recv() is to get the hdr information
89+
* so we know how many bytes to read. Life would be very complicated
90+
* if we read too much data (buffering).
9191
*/
9292
tmp= ((Addr)buf)+port->nBytes;
9393

@@ -227,7 +227,7 @@ PacketSend(Port *port,
227227
Assert(!nonBlocking);
228228
Assert(buf);
229229

230-
doneLen=write(port->sock,buf,len);
230+
doneLen=write(port->sock,buf,len);
231231
if (doneLen<len)
232232
{
233233
sprintf(PQerrormsg,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp