mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-12 17:37:07 +08:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments to the right of code, and remove pgindent hack that caused comments following #endif to not obey the general rule. Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using the published version of pg_bsd_indent, but a hacked-up version that tried to minimize the amount of movement of comments to the right of code. The situation of interest is where such a comment has to be moved to the right of its default placement at column 33 because there's code there. BSD indent has always moved right in units of tab stops in such cases --- but in the previous incarnation, indent was working in 8-space tab stops, while now it knows we use 4-space tabs. So the net result is that in about half the cases, such comments are placed one tab stop left of before. This is better all around: it leaves more room on the line for comment text, and it means that in such cases the comment uniformly starts at the next 4-space tab stop after the code, rather than sometimes one and sometimes two tabs after. Also, ensure that comments following #endif are indented the same as comments following other preprocessor commands such as #else. That inconsistency turns out to have been self-inflicted damage from a poorly-thought-through post-indent "fixup" in pgindent. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
163 lines
3.9 KiB
C
163 lines
3.9 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* getaddrinfo.h
|
|
* Support getaddrinfo() on platforms that don't have it.
|
|
*
|
|
* Note: we use our own routines on platforms that don't HAVE_STRUCT_ADDRINFO,
|
|
* whether or not the library routine getaddrinfo() can be found. This
|
|
* policy is needed because on some platforms a manually installed libbind.a
|
|
* may provide getaddrinfo(), yet the system headers may not provide the
|
|
* struct definitions needed to call it. To avoid conflict with the libbind
|
|
* definition in such cases, we rename our routines to pg_xxx() via macros.
|
|
*
|
|
* This code will also work on platforms where struct addrinfo is defined
|
|
* in the system headers but no getaddrinfo() can be located.
|
|
*
|
|
* Copyright (c) 2003-2017, PostgreSQL Global Development Group
|
|
*
|
|
* src/include/getaddrinfo.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef GETADDRINFO_H
|
|
#define GETADDRINFO_H
|
|
|
|
#include <sys/socket.h>
|
|
#include <netdb.h>
|
|
|
|
|
|
/* Various macros that ought to be in <netdb.h>, but might not be */
|
|
|
|
#ifndef EAI_FAIL
|
|
#ifndef WIN32
|
|
#define EAI_BADFLAGS (-1)
|
|
#define EAI_NONAME (-2)
|
|
#define EAI_AGAIN (-3)
|
|
#define EAI_FAIL (-4)
|
|
#define EAI_FAMILY (-6)
|
|
#define EAI_SOCKTYPE (-7)
|
|
#define EAI_SERVICE (-8)
|
|
#define EAI_MEMORY (-10)
|
|
#define EAI_SYSTEM (-11)
|
|
#else /* WIN32 */
|
|
#ifdef _MSC_VER
|
|
#ifndef WSA_NOT_ENOUGH_MEMORY
|
|
#define WSA_NOT_ENOUGH_MEMORY (WSAENOBUFS)
|
|
#endif
|
|
#define WSATYPE_NOT_FOUND (WSABASEERR+109)
|
|
#endif
|
|
#define EAI_AGAIN WSATRY_AGAIN
|
|
#define EAI_BADFLAGS WSAEINVAL
|
|
#define EAI_FAIL WSANO_RECOVERY
|
|
#define EAI_FAMILY WSAEAFNOSUPPORT
|
|
#define EAI_MEMORY WSA_NOT_ENOUGH_MEMORY
|
|
#define EAI_NODATA WSANO_DATA
|
|
#define EAI_NONAME WSAHOST_NOT_FOUND
|
|
#define EAI_SERVICE WSATYPE_NOT_FOUND
|
|
#define EAI_SOCKTYPE WSAESOCKTNOSUPPORT
|
|
#endif /* !WIN32 */
|
|
#endif /* !EAI_FAIL */
|
|
|
|
#ifndef AI_PASSIVE
|
|
#define AI_PASSIVE 0x0001
|
|
#endif
|
|
|
|
#ifndef AI_NUMERICHOST
|
|
/*
|
|
* some platforms don't support AI_NUMERICHOST; define as zero if using
|
|
* the system version of getaddrinfo...
|
|
*/
|
|
#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO)
|
|
#define AI_NUMERICHOST 0
|
|
#else
|
|
#define AI_NUMERICHOST 0x0004
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef NI_NUMERICHOST
|
|
#define NI_NUMERICHOST 1
|
|
#endif
|
|
#ifndef NI_NUMERICSERV
|
|
#define NI_NUMERICSERV 2
|
|
#endif
|
|
#ifndef NI_NAMEREQD
|
|
#define NI_NAMEREQD 4
|
|
#endif
|
|
|
|
#ifndef NI_MAXHOST
|
|
#define NI_MAXHOST 1025
|
|
#endif
|
|
#ifndef NI_MAXSERV
|
|
#define NI_MAXSERV 32
|
|
#endif
|
|
|
|
|
|
#ifndef HAVE_STRUCT_ADDRINFO
|
|
|
|
#ifndef WIN32
|
|
struct addrinfo
|
|
{
|
|
int ai_flags;
|
|
int ai_family;
|
|
int ai_socktype;
|
|
int ai_protocol;
|
|
size_t ai_addrlen;
|
|
struct sockaddr *ai_addr;
|
|
char *ai_canonname;
|
|
struct addrinfo *ai_next;
|
|
};
|
|
#else
|
|
/*
|
|
* The order of the structure elements on Win32 doesn't match the
|
|
* order specified in the standard, but we have to match it for
|
|
* IPv6 to work.
|
|
*/
|
|
struct addrinfo
|
|
{
|
|
int ai_flags;
|
|
int ai_family;
|
|
int ai_socktype;
|
|
int ai_protocol;
|
|
size_t ai_addrlen;
|
|
char *ai_canonname;
|
|
struct sockaddr *ai_addr;
|
|
struct addrinfo *ai_next;
|
|
};
|
|
#endif
|
|
#endif /* HAVE_STRUCT_ADDRINFO */
|
|
|
|
|
|
#ifndef HAVE_GETADDRINFO
|
|
|
|
/* Rename private copies per comments above */
|
|
#ifdef getaddrinfo
|
|
#undef getaddrinfo
|
|
#endif
|
|
#define getaddrinfo pg_getaddrinfo
|
|
|
|
#ifdef freeaddrinfo
|
|
#undef freeaddrinfo
|
|
#endif
|
|
#define freeaddrinfo pg_freeaddrinfo
|
|
|
|
#ifdef gai_strerror
|
|
#undef gai_strerror
|
|
#endif
|
|
#define gai_strerror pg_gai_strerror
|
|
|
|
#ifdef getnameinfo
|
|
#undef getnameinfo
|
|
#endif
|
|
#define getnameinfo pg_getnameinfo
|
|
|
|
extern int getaddrinfo(const char *node, const char *service,
|
|
const struct addrinfo *hints, struct addrinfo **res);
|
|
extern void freeaddrinfo(struct addrinfo *res);
|
|
extern const char *gai_strerror(int errcode);
|
|
extern int getnameinfo(const struct sockaddr *sa, int salen,
|
|
char *node, int nodelen,
|
|
char *service, int servicelen, int flags);
|
|
#endif /* HAVE_GETADDRINFO */
|
|
|
|
#endif /* GETADDRINFO_H */
|