1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-26 01:22:12 +03:00

pgindent run for 9.6

This commit is contained in:
Robert Haas
2016-06-09 18:02:36 -04:00
parent 9164deea2f
commit 4bc424b968
252 changed files with 2670 additions and 2558 deletions

View File

@ -28,9 +28,9 @@ typedef struct
{
uint32 val:8,
isword:1,
/* Stores compound flags listed below */
/* Stores compound flags listed below */
compoundflag:4,
/* Reference to an entry of the AffixData field */
/* Reference to an entry of the AffixData field */
affix:19;
struct SPNode *node;
} SPNodeData;
@ -63,8 +63,8 @@ typedef struct spell_struct
union
{
/*
* flag is filled in by NIImportDictionary(). After NISortDictionary(),
* d is used instead of flag.
* flag is filled in by NIImportDictionary(). After
* NISortDictionary(), d is used instead of flag.
*/
char *flag;
/* d is used in mkSPNode() */
@ -87,7 +87,7 @@ typedef struct spell_struct
typedef struct aff_struct
{
char *flag;
/* FF_SUFFIX or FF_PREFIX */
/* FF_SUFFIX or FF_PREFIX */
uint32 type:1,
flagflags:7,
issimple:1,
@ -151,9 +151,9 @@ typedef struct
*/
typedef enum
{
FM_CHAR, /* one character (like ispell) */
FM_LONG, /* two characters */
FM_NUM /* number, >= 0 and < 65536 */
FM_CHAR, /* one character (like ispell) */
FM_LONG, /* two characters */
FM_NUM /* number, >= 0 and < 65536 */
} FlagMode;
/*
@ -202,11 +202,11 @@ typedef struct
*/
/* Array of Hunspell options in affix file */
CompoundAffixFlag *CompoundAffixFlags;
CompoundAffixFlag *CompoundAffixFlags;
/* number of entries in CompoundAffixFlags array */
int nCompoundAffixFlag;
int nCompoundAffixFlag;
/* allocated length of CompoundAffixFlags array */
int mCompoundAffixFlag;
int mCompoundAffixFlag;
/*
* Remaining fields are only used during dictionary construction; they are

View File

@ -34,17 +34,17 @@ typedef struct
*/
typedef struct
{
uint32 selected: 1,
in: 1,
replace: 1,
repeated: 1,
skip: 1,
unused: 3,
type: 8,
len: 16;
WordEntryPos pos;
char *word;
QueryOperand *item;
uint32 selected:1,
in:1,
replace:1,
repeated:1,
skip:1,
unused:3,
type:8,
len:16;
WordEntryPos pos;
char *word;
QueryOperand *item;
} HeadlineWordEntry;
typedef struct
@ -52,7 +52,7 @@ typedef struct
HeadlineWordEntry *words;
int32 lenwords;
int32 curwords;
int32 vectorpos; /* positions a-la tsvector */
int32 vectorpos; /* positions a-la tsvector */
char *startsel;
char *stopsel;
char *fragdelim;

View File

@ -49,7 +49,7 @@ typedef struct
#define MAXSTRLEN ( (1<<11) - 1)
#define MAXSTRPOS ( (1<<20) - 1)
extern int compareWordEntryPos(const void *a, const void *b);
extern int compareWordEntryPos(const void *a, const void *b);
/*
* Equivalent to
@ -230,16 +230,15 @@ typedef struct
extern const int tsearch_op_priority[OP_COUNT];
#define NOT_PHRASE_P 5 /*
* OP_PHRASE negation operations must have greater
* priority in order to force infix() to surround
* the whole OP_PHRASE expression with parentheses.
*/
#define NOT_PHRASE_P 5 /* OP_PHRASE negation operations must have
* greater priority in order to force infix()
* to surround the whole OP_PHRASE expression
* with parentheses. */
#define TOP_PRIORITY 6 /* highest priority for val nodes */
#define TOP_PRIORITY 6 /* highest priority for val nodes */
/* get operation priority by its code*/
#define OP_PRIORITY(x) ( tsearch_op_priority[(x) - 1] )
#define OP_PRIORITY(x) ( tsearch_op_priority[(x) - 1] )
/* get QueryOperator priority */
#define QO_PRIORITY(x) OP_PRIORITY(((QueryOperator *) (x))->oper)
/* special case: get QueryOperator priority for correct printing !(a <-> b>) */

View File

@ -106,9 +106,9 @@ extern text *generateHeadline(HeadlineParsedText *prs);
*/
typedef struct ExecPhraseData
{
int npos;
bool allocated;
WordEntryPos *pos;
int npos;
bool allocated;
WordEntryPos *pos;
} ExecPhraseData;
extern bool TS_execute(QueryItem *curitem, void *checkval, bool calcnot,