Rename PortName to PortNumber.

diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index c313261a6acb7717659d84929ce10e951d8ffa54..5da5477b42ba0543b9ae23b3e0046df84d9f6590 100644 (file)
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -175,7 +175,7 @@ StreamDoUnlink(void)
  */
 
 int
-StreamServerPort(int family, char *hostName, unsigned short portName,
+StreamServerPort(int family, char *hostName, unsigned short portNumber,
                                 char *unixSocketName, int *fdP)
 {
        SockAddr        saddr;
@@ -219,7 +219,7 @@ StreamServerPort(int family, char *hostName, unsigned short portName,
 #ifdef HAVE_UNIX_SOCKETS
        if (family == AF_UNIX)
        {
-               UNIXSOCK_PATH(saddr.un, portName, unixSocketName);
+               UNIXSOCK_PATH(saddr.un, portNumber, unixSocketName);
                len = UNIXSOCK_LEN(saddr.un);
                strcpy(sock_path, saddr.un.sun_path);
                /*
@@ -265,7 +265,7 @@ StreamServerPort(int family, char *hostName, unsigned short portName,
                                        hp->h_length);
                }
        
-               saddr.in.sin_port = htons(portName);
+               saddr.in.sin_port = htons(portNumber);
                len = sizeof(struct sockaddr_in);
        }
 

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 6079d92bdf1fbf78ae99d4c93fb6fa44f05c8277..a5756259d61268cdd44a22fd336d7e7d45b5a2d7 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -113,7 +113,7 @@ static Dllist *BackendList;
 static Dllist *PortList;
 
 /* The socket number we are listening for connections on */
-int PostPortName;
+int PostPortNumber;
 char * UnixSocketName;
 char * HostName;
 
@@ -511,7 +511,7 @@ PostmasterMain(int argc, char *argv[])
                                strcpy(original_extraoptions, optarg);
                                break;
                        case 'p':
-                               PostPortName = atoi(optarg);
+                               PostPortNumber = atoi(optarg);
                                break;
                        case 'S':
 
@@ -616,7 +616,7 @@ PostmasterMain(int argc, char *argv[])
        if (NetServer)
        {
                status = StreamServerPort(AF_INET, HostName,
-                                               (unsigned short) PostPortName, UnixSocketName,
+                                               (unsigned short) PostPortNumber, UnixSocketName,
                                                &ServerSock_INET);
                if (status != STATUS_OK)
                {
@@ -628,7 +628,7 @@ PostmasterMain(int argc, char *argv[])
 
 #ifdef HAVE_UNIX_SOCKETS
        status = StreamServerPort(AF_UNIX, HostName,
-                                               (unsigned short) PostPortName, UnixSocketName, 
+                                               (unsigned short) PostPortNumber, UnixSocketName, 
                                                &ServerSock_UNIX);
        if (status != STATUS_OK)
        {
@@ -639,7 +639,7 @@ PostmasterMain(int argc, char *argv[])
 #endif
 
        /* set up shared memory and semaphores */
-       reset_shared(PostPortName);
+       reset_shared(PostPortNumber);
 
        /* Init XLOG paths */
        snprintf(XLogDir, MAXPGPATH, "%s/pg_xlog", DataDir);
@@ -1619,7 +1619,7 @@ reaper(SIGNAL_ARGS)
                                ctime(&tnow));
                fflush(stderr);
                shmem_exit(0);
-               reset_shared(PostPortName);
+               reset_shared(PostPortNumber);
                StartupPID = StartupDataBase();
                return;
        }

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index d8425e0e6477e7d335abde83fde09165dc1c9beb..66d9fa7df4248fa39322dcb9d5945aae0057804f 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -245,7 +245,7 @@ ConfigureNamesInt[] =
         DEF_MAXBACKENDS, 1, MAXBACKENDS},
        {"shared_buffers",          PGC_POSTMASTER,         &NBuffers,
         DEF_NBUFFERS, 16, INT_MAX},
-       {"port",                    PGC_POSTMASTER,         &PostPortName,
+       {"port",                    PGC_POSTMASTER,         &PostPortNumber,
         DEF_PGPORT, 1, 65535},
 
        {"sort_mem",                PGC_USERSET,            &SortMem,
@@ -409,7 +409,7 @@ ResetAllOptions(void)
        }
 
        if (getenv("PGPORT"))
-               PostPortName = atoi(getenv("PGPORT"));
+               PostPortNumber = atoi(getenv("PGPORT"));
 }
 
 

diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index aa20b47a38f15419df081998235d2552cb05238f..acd49433a3874bb504babaaeed216fb699c14ec7 100644 (file)
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -56,7 +56,7 @@ extern char PQerrormsg[PQERRORMSG_LENGTH];            /* in libpq/util.c */
  * prototypes for functions in pqcomm.c
  */
 extern int     StreamServerPort(int family, char *hostName,
-                       unsigned short portName, char *unixSocketName, int *fdP);
+                       unsigned short portNumber, char *unixSocketName, int *fdP);
 extern int     StreamConnection(int server_fd, Port *port);
 extern void StreamClose(int sock);
 extern void pq_init(void);

diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 5c8b941a64678490bc41b4bac4c9091ca8ae34ef..2dbc330fa7d534c81c79218a8662da24a5acaca8 100644 (file)
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -110,7 +110,7 @@ extern bool EnableSSL;
 extern bool SilentMode;
 extern int MaxBackends;
 extern int NBuffers;
-extern int PostPortName;
+extern int PostPortNumber;
 
 /*****************************************************************************
  *       pdir.h --                                                                                                                              *

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 24d122e030a6b101fb023ad1c14c37456ae61d4a..3f3cf6fe2d4c2a608ffb1dc25e8230a1320cd80c 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -342,13 +342,6 @@ PQconnectStart(const char *conninfo)
                conn->pgunixsocket = conn->pghost;
                conn->pghost = NULL;
        }
-       if (conn->pghostaddr && conn->pghostaddr[0] == '/')
-       {
-               if (conn->pgunixsocket)
-                       free(conn->pgunixsocket);
-               conn->pgunixsocket = conn->pghostaddr;
-               conn->pghostaddr = NULL;
-       }
 
        /* ----------
         * Connect to the database
@@ -474,13 +467,6 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
                conn->pgunixsocket = conn->pghost;
                conn->pghost = NULL;
        }
-       if (conn->pghostaddr && conn->pghostaddr[0] == '/')
-       {
-               if (conn->pgunixsocket)
-                       free(conn->pgunixsocket);
-               conn->pgunixsocket = conn->pghostaddr;
-               conn->pghostaddr = NULL;
-       }
 
        if (pgtty == NULL)
        {