mirror of
https://github.com/postgres/postgres.git
synced 2026-03-18 00:22:18 -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
103 lines
3.4 KiB
C
103 lines
3.4 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* nabstime.h
|
|
* Definitions for the "new" abstime code.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/nabstime.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef NABSTIME_H
|
|
#define NABSTIME_H
|
|
|
|
#include <limits.h>
|
|
|
|
#include "fmgr.h"
|
|
#include "pgtime.h"
|
|
|
|
|
|
/* ----------------------------------------------------------------
|
|
*
|
|
* time types + support macros
|
|
*
|
|
* ----------------------------------------------------------------
|
|
*/
|
|
|
|
/*
|
|
* Although time_t generally is a long int on 64 bit systems, these two
|
|
* types must be 4 bytes, because that's what pg_type.h assumes. They
|
|
* should be yanked (long) before 2038 and be replaced by timestamp and
|
|
* interval.
|
|
*/
|
|
typedef int32 AbsoluteTime;
|
|
typedef int32 RelativeTime;
|
|
|
|
typedef struct
|
|
{
|
|
int32 status;
|
|
AbsoluteTime data[2];
|
|
} TimeIntervalData;
|
|
|
|
typedef TimeIntervalData *TimeInterval;
|
|
|
|
/*
|
|
* Macros for fmgr-callable functions.
|
|
*/
|
|
#define DatumGetAbsoluteTime(X) ((AbsoluteTime) DatumGetInt32(X))
|
|
#define DatumGetRelativeTime(X) ((RelativeTime) DatumGetInt32(X))
|
|
#define DatumGetTimeInterval(X) ((TimeInterval) DatumGetPointer(X))
|
|
|
|
#define AbsoluteTimeGetDatum(X) Int32GetDatum(X)
|
|
#define RelativeTimeGetDatum(X) Int32GetDatum(X)
|
|
#define TimeIntervalGetDatum(X) PointerGetDatum(X)
|
|
|
|
#define PG_GETARG_ABSOLUTETIME(n) DatumGetAbsoluteTime(PG_GETARG_DATUM(n))
|
|
#define PG_GETARG_RELATIVETIME(n) DatumGetRelativeTime(PG_GETARG_DATUM(n))
|
|
#define PG_GETARG_TIMEINTERVAL(n) DatumGetTimeInterval(PG_GETARG_DATUM(n))
|
|
|
|
#define PG_RETURN_ABSOLUTETIME(x) return AbsoluteTimeGetDatum(x)
|
|
#define PG_RETURN_RELATIVETIME(x) return RelativeTimeGetDatum(x)
|
|
#define PG_RETURN_TIMEINTERVAL(x) return TimeIntervalGetDatum(x)
|
|
|
|
/*
|
|
* Reserved values
|
|
* Epoch is Unix system time zero, but needs to be kept as a reserved
|
|
* value rather than converting to time since timezone calculations
|
|
* might move it away from 1970-01-01 00:00:00Z - tgl 97/02/20
|
|
*
|
|
* Pre-v6.1 code had large decimal numbers for reserved values.
|
|
* These were chosen as special 32-bit bit patterns,
|
|
* so redefine them explicitly using these bit patterns. - tgl 97/02/24
|
|
*/
|
|
#define INVALID_ABSTIME ((AbsoluteTime) 0x7FFFFFFE) /* 2147483647 (2^31 - 1) */
|
|
#define NOEND_ABSTIME ((AbsoluteTime) 0x7FFFFFFC) /* 2147483645 (2^31 - 3) */
|
|
#define NOSTART_ABSTIME ((AbsoluteTime) INT_MIN) /* -2147483648 */
|
|
|
|
#define INVALID_RELTIME ((RelativeTime) 0x7FFFFFFE) /* 2147483647 (2^31 - 1) */
|
|
|
|
#define AbsoluteTimeIsValid(time) \
|
|
((bool) ((time) != INVALID_ABSTIME))
|
|
|
|
/*
|
|
* Because NOSTART_ABSTIME is defined as INT_MIN, there can't be any
|
|
* AbsoluteTime values less than it. Therefore, we can code the test
|
|
* "time > NOSTART_ABSTIME" as "time != NOSTART_ABSTIME", which avoids
|
|
* compiler bugs on some platforms. --- tgl & az, 11/2000
|
|
*/
|
|
#define AbsoluteTimeIsReal(time) \
|
|
((bool) (((AbsoluteTime) (time)) < NOEND_ABSTIME && \
|
|
((AbsoluteTime) (time)) != NOSTART_ABSTIME))
|
|
|
|
#define RelativeTimeIsValid(time) \
|
|
((bool) (((RelativeTime) (time)) != INVALID_RELTIME))
|
|
|
|
|
|
/* non-fmgr-callable support routines */
|
|
extern AbsoluteTime GetCurrentAbsoluteTime(void);
|
|
extern void abstime2tm(AbsoluteTime time, int *tzp, struct pg_tm *tm, char **tzn);
|
|
|
|
#endif /* NABSTIME_H */
|