Remove hbaPort type

This was just a workaround to avoid including the header file that
defines the Port type.  With C11, we can now just re-define the Port
type without the possibility of a conflict.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/10d32190-f31b-40a5-b177-11db55597355@eisentraut.org

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 4da46666439db5e348e03df4ced2d7f931036403..ec4dbacf01552fee8e329fb278c7489c28f53022 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -70,14 +70,14 @@ static int  CheckMD5Auth(Port *port, char *shadow_pass,
 /* Standard TCP port number for Ident service.  Assigned by IANA */
 #define IDENT_PORT 113
 
-static int     ident_inet(hbaPort *port);
+static int     ident_inet(Port *port);
 
 
 /*----------------------------------------------------------------
  * Peer authentication
  *----------------------------------------------------------------
  */
-static int     auth_peer(hbaPort *port);
+static int     auth_peer(Port *port);
 
 
 /*----------------------------------------------------------------
@@ -1668,7 +1668,7 @@ interpret_ident_response(const char *ident_response,
  *     latch was set would improve the responsiveness to timeouts/cancellations.
  */
 static int
-ident_inet(hbaPort *port)
+ident_inet(Port *port)
 {
        const SockAddr remote_addr = port->raddr;
        const SockAddr local_addr = port->laddr;
@@ -1853,7 +1853,7 @@ ident_inet_done:
  *     Iff authorized, return STATUS_OK, otherwise return STATUS_ERROR.
  */
 static int
-auth_peer(hbaPort *port)
+auth_peer(Port *port)
 {
        uid_t           uid;
        gid_t           gid;

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index fecee8224d075887d795fbc7536121b4dfb534dc..97a3586000bb29cb1eb475be80b95dcc5b11c88f 100644 (file)
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1075,7 +1075,7 @@ hostname_match(const char *pattern, const char *actual_hostname)
  * Check to see if a connecting IP matches a given host name.
  */
 static bool
-check_hostname(hbaPort *port, const char *hostname)
+check_hostname(Port *port, const char *hostname)
 {
        struct addrinfo *gai_result,
                           *gai;
@@ -2528,7 +2528,7 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
  *     request.
  */
 static void
-check_hba(hbaPort *port)
+check_hba(Port *port)
 {
        Oid                     roleid;
        ListCell   *line;
@@ -3125,7 +3125,7 @@ load_ident(void)
  *     method = uaImplicitReject.
  */
 void
-hba_getauthmethod(hbaPort *port)
+hba_getauthmethod(Port *port)
 {
        check_hba(port);
 }

diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 3657f182db3e3ee3a4ca52bfe53738a79a84082a..e3748d3c8c963628c204834f6ed9881d39503b17 100644 (file)
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -169,13 +169,13 @@ typedef struct TokenizedAuthLine
        char       *err_msg;            /* Error message if any */
 } TokenizedAuthLine;
 
-/* kluge to avoid including libpq/libpq-be.h here */
-typedef struct Port hbaPort;
+/* avoid including libpq/libpq-be.h here */
+typedef struct Port Port;
 
 extern bool load_hba(void);
 extern bool load_ident(void);
 extern const char *hba_authname(UserAuth auth_method);
-extern void hba_getauthmethod(hbaPort *port);
+extern void hba_getauthmethod(Port *port);
 extern int     check_usermap(const char *usermap_name,
                                                  const char *pg_user, const char *system_user,
                                                  bool case_insensitive);

diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index a13e8162890233dd95bc299db71a8ef9128d5e15..9db8e2424c03884d3ad69bd280622dddc8e7a3a9 100644 (file)
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -3687,7 +3687,6 @@ gss_key_value_set_desc
 gss_name_t
 gtrgm_consistent_cache
 gzFile
-hbaPort
 heap_page_items_state
 help_handler
 hlCheck