mirror of
https://github.com/postgres/postgres.git
synced 2026-07-04 07:15:50 -04: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 e3860ffa4d 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
124 lines
4.1 KiB
C
124 lines
4.1 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* builtins.h
|
|
* Declarations for operations on built-in types.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/builtins.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef BUILTINS_H
|
|
#define BUILTINS_H
|
|
|
|
#include "fmgr.h"
|
|
#include "nodes/nodes.h"
|
|
#include "utils/fmgrprotos.h"
|
|
|
|
|
|
/* bool.c */
|
|
extern bool parse_bool(const char *value, bool *result);
|
|
extern bool parse_bool_with_len(const char *value, size_t len, bool *result);
|
|
|
|
/* domains.c */
|
|
extern void domain_check(Datum value, bool isnull, Oid domainType,
|
|
void **extra, MemoryContext mcxt);
|
|
extern int errdatatype(Oid datatypeOid);
|
|
extern int errdomainconstraint(Oid datatypeOid, const char *conname);
|
|
|
|
/* encode.c */
|
|
extern unsigned hex_encode(const char *src, unsigned len, char *dst);
|
|
extern unsigned hex_decode(const char *src, unsigned len, char *dst);
|
|
|
|
/* int.c */
|
|
extern int2vector *buildint2vector(const int16 *int2s, int n);
|
|
|
|
/* name.c */
|
|
extern int namecpy(Name n1, Name n2);
|
|
extern int namestrcpy(Name name, const char *str);
|
|
extern int namestrcmp(Name name, const char *str);
|
|
|
|
/* numutils.c */
|
|
extern int32 pg_atoi(const char *s, int size, int c);
|
|
extern void pg_itoa(int16 i, char *a);
|
|
extern void pg_ltoa(int32 l, char *a);
|
|
extern void pg_lltoa(int64 ll, char *a);
|
|
extern char *pg_ltostr_zeropad(char *str, int32 value, int32 minwidth);
|
|
extern char *pg_ltostr(char *str, int32 value);
|
|
extern uint64 pg_strtouint64(const char *str, char **endptr, int base);
|
|
|
|
/* float.c */
|
|
extern PGDLLIMPORT int extra_float_digits;
|
|
|
|
extern double get_float8_infinity(void);
|
|
extern float get_float4_infinity(void);
|
|
extern double get_float8_nan(void);
|
|
extern float get_float4_nan(void);
|
|
extern int is_infinite(double val);
|
|
extern double float8in_internal(char *num, char **endptr_p,
|
|
const char *type_name, const char *orig_string);
|
|
extern char *float8out_internal(double num);
|
|
extern int float4_cmp_internal(float4 a, float4 b);
|
|
extern int float8_cmp_internal(float8 a, float8 b);
|
|
|
|
/* oid.c */
|
|
extern oidvector *buildoidvector(const Oid *oids, int n);
|
|
extern Oid oidparse(Node *node);
|
|
extern int oid_cmp(const void *p1, const void *p2);
|
|
|
|
/* regexp.c */
|
|
extern char *regexp_fixed_prefix(text *text_re, bool case_insensitive,
|
|
Oid collation, bool *exact);
|
|
|
|
/* ruleutils.c */
|
|
extern bool quote_all_identifiers;
|
|
extern const char *quote_identifier(const char *ident);
|
|
extern char *quote_qualified_identifier(const char *qualifier,
|
|
const char *ident);
|
|
|
|
/* varchar.c */
|
|
extern int bpchartruelen(char *s, int len);
|
|
|
|
/* popular functions from varlena.c */
|
|
extern text *cstring_to_text(const char *s);
|
|
extern text *cstring_to_text_with_len(const char *s, int len);
|
|
extern char *text_to_cstring(const text *t);
|
|
extern void text_to_cstring_buffer(const text *src, char *dst, size_t dst_len);
|
|
|
|
#define CStringGetTextDatum(s) PointerGetDatum(cstring_to_text(s))
|
|
#define TextDatumGetCString(d) text_to_cstring((text *) DatumGetPointer(d))
|
|
|
|
/* xid.c */
|
|
extern int xidComparator(const void *arg1, const void *arg2);
|
|
|
|
/* inet_cidr_ntop.c */
|
|
extern char *inet_cidr_ntop(int af, const void *src, int bits,
|
|
char *dst, size_t size);
|
|
|
|
/* inet_net_pton.c */
|
|
extern int inet_net_pton(int af, const char *src,
|
|
void *dst, size_t size);
|
|
|
|
/* network.c */
|
|
extern double convert_network_to_scalar(Datum value, Oid typid);
|
|
extern Datum network_scan_first(Datum in);
|
|
extern Datum network_scan_last(Datum in);
|
|
extern void clean_ipv6_addr(int addr_family, char *addr);
|
|
|
|
/* numeric.c */
|
|
extern Datum numeric_float8_no_overflow(PG_FUNCTION_ARGS);
|
|
|
|
/* format_type.c */
|
|
extern char *format_type_be(Oid type_oid);
|
|
extern char *format_type_be_qualified(Oid type_oid);
|
|
extern char *format_type_with_typemod(Oid type_oid, int32 typemod);
|
|
extern char *format_type_with_typemod_qualified(Oid type_oid, int32 typemod);
|
|
extern int32 type_maximum_size(Oid type_oid, int32 typemod);
|
|
|
|
/* quote.c */
|
|
extern char *quote_literal_cstr(const char *rawstr);
|
|
|
|
#endif /* BUILTINS_H */
|