Sync typedefs.list with the buildfarm.

tglsfdc · tglsfdc · commit b27644bade03 · 2025-06-15T13:04:24.000-04:00
Our maintenance of typedefs.list has been a little haphazard
(and apparently we can't alphabetize worth a darn).  Replace
the file with the authoritative list from our buildfarm, and
run pgindent using that.

I also updated the additions/exclusions lists in pgindent where
necessary to keep pgindent from messing things up significantly.
Notably, now that regex_t and some related names are macros not real
typedefs, we have to whitelist them explicitly.  The exclusions list
has also drifted noticeably, presumably due to changes of system
headers on the buildfarm animals that contribute to the list.

Unlike in prior years, I've not manually added typedef names that
are missing from the buildfarm's list because they are not used to
declare any variables or fields.  So there are a few places where
the typedef declaration itself is formatted worse than before,
e.g. typedef enum IoMethod.  I could preserve the names that were
manually added to the list previously, but I'd really prefer to find
a less manual way of dealing with these cases.  A quick grep finds
about 75 such symbols, most of which have never gotten any special
treatment.

Per discussion among pgsql-release, doing this now seems appropriate
even though we're still a week or two away from making the v18 branch.
diff --git a/src/backend/utils/adt/mcxtfuncs.c b/src/backend/utils/adt/mcxtfuncs.c
@@ -38,7 +38,7 @@ typedef struct MemoryContextId
 {
 	MemoryContext context;
 	int			context_id;
-}			MemoryContextId;
+} MemoryContextId;
 
 /*
  * int_list_to_array
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
@@ -96,7 +96,7 @@ typedef struct HeapScanDescData
 	uint32		rs_cindex;		/* current tuple's index in vistuples */
 	uint32		rs_ntuples;		/* number of visible tuples on page */
 	OffsetNumber rs_vistuples[MaxHeapTuplesPerPage];	/* their offsets */
-}			HeapScanDescData;
+} HeapScanDescData;
 typedef struct HeapScanDescData *HeapScanDesc;
 
 typedef struct BitmapHeapScanDescData
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
@@ -264,7 +264,7 @@ typedef struct AggStatePerGroupData
 	 * NULL and not auto-replace it with a later input value. Only the first
 	 * non-NULL input will be auto-substituted.
 	 */
-} AggStatePerGroupData;
+}			AggStatePerGroupData;
 
 /*
  * AggStatePerPhaseData - per-grouping-set-phase state
diff --git a/src/include/storage/aio.h b/src/include/storage/aio.h
@@ -36,7 +36,7 @@ typedef enum IoMethod
 #ifdef IOMETHOD_IO_URING_ENABLED
 	IOMETHOD_IO_URING,
 #endif
-} IoMethod;
+}			IoMethod;
 
 /* We'll default to worker based execution. */
 #define DEFAULT_IO_METHOD IOMETHOD_WORKER
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
@@ -17,7 +17,7 @@ typedef enum FileCopyMethod
 {
 	FILE_COPY_METHOD_COPY,
 	FILE_COPY_METHOD_CLONE,
-} FileCopyMethod;
+}			FileCopyMethod;
 
 /* GUC parameters */
 extern PGDLLIMPORT int file_copy_method;
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
@@ -119,7 +119,7 @@ typedef struct
 	Oid			dbId;			/* database ID */
 	Oid			relid;			/* relation ID, or 0 if whole
 								 * RelationSyncCache */
-}			SharedInvalRelSyncMsg;
+} SharedInvalRelSyncMsg;
 
 typedef union
 {
diff --git a/src/include/tcop/backend_startup.h b/src/include/tcop/backend_startup.h
@@ -86,7 +86,7 @@ typedef enum LogConnectionOption
 		LOG_CONNECTION_AUTHENTICATION |
 		LOG_CONNECTION_AUTHORIZATION |
 		LOG_CONNECTION_SETUP_DURATIONS,
-} LogConnectionOption;
+}			LogConnectionOption;
 
 /*
  * A collection of timings of various stages of connection establishment and
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
@@ -485,7 +485,7 @@ typedef enum
 	PGERROR_TERSE,				/* single-line error messages */
 	PGERROR_DEFAULT,			/* recommended style */
 	PGERROR_VERBOSE,			/* all the facts, ma'am */
-} PGErrorVerbosity;
+}			PGErrorVerbosity;
 
 extern PGDLLIMPORT int Log_error_verbosity;
 extern PGDLLIMPORT char *Log_line_prefix;
diff --git a/src/include/utils/skipsupport.h b/src/include/utils/skipsupport.h
@@ -90,7 +90,7 @@ typedef struct SkipSupportData
 	 */
 	SkipSupportIncDec decrement;
 	SkipSupportIncDec increment;
-} SkipSupportData;
+}			SkipSupportData;
 
 extern SkipSupport PrepareSkipSupportFromOpclass(Oid opfamily, Oid opcintype,
 												 bool reverse);
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
@@ -58,9 +58,9 @@ static PyType_Slot PLyCursor_slots[] =
 static PyType_Spec PLyCursor_spec =
 {
 	.name = "PLyCursor",
-		.basicsize = sizeof(PLyCursorObject),
-		.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-		.slots = PLyCursor_slots,
+	.basicsize = sizeof(PLyCursorObject),
+	.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+	.slots = PLyCursor_slots,
 };
 
 static PyTypeObject *PLy_CursorType;
diff --git a/src/pl/plpython/plpy_planobject.c b/src/pl/plpython/plpy_planobject.c
@@ -45,9 +45,9 @@ static PyType_Slot PLyPlan_slots[] =
 static PyType_Spec PLyPlan_spec =
 {
 	.name = "PLyPlan",
-		.basicsize = sizeof(PLyPlanObject),
-		.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-		.slots = PLyPlan_slots,
+	.basicsize = sizeof(PLyPlanObject),
+	.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+	.slots = PLyPlan_slots,
 };
 
 static PyTypeObject *PLy_PlanType;
diff --git a/src/pl/plpython/plpy_resultobject.c b/src/pl/plpython/plpy_resultobject.c
@@ -70,9 +70,9 @@ static PyType_Slot PLyResult_slots[] =
 static PyType_Spec PLyResult_spec =
 {
 	.name = "PLyResult",
-		.basicsize = sizeof(PLyResultObject),
-		.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-		.slots = PLyResult_slots,
+	.basicsize = sizeof(PLyResultObject),
+	.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+	.slots = PLyResult_slots,
 };
 
 static PyTypeObject *PLy_ResultType;
diff --git a/src/pl/plpython/plpy_subxactobject.c b/src/pl/plpython/plpy_subxactobject.c
@@ -46,9 +46,9 @@ static PyType_Slot PLySubtransaction_slots[] =
 static PyType_Spec PLySubtransaction_spec =
 {
 	.name = "PLySubtransaction",
-		.basicsize = sizeof(PLySubtransactionObject),
-		.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-		.slots = PLySubtransaction_slots,
+	.basicsize = sizeof(PLySubtransactionObject),
+	.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+	.slots = PLySubtransaction_slots,
 };
 
 static PyTypeObject *PLy_SubtransactionType;
diff --git a/src/test/modules/test_aio/test_aio.c b/src/test/modules/test_aio/test_aio.c
@@ -42,9 +42,9 @@ typedef struct InjIoErrorState
 
 	bool		short_read_result_set;
 	int			short_read_result;
-}			InjIoErrorState;
+} InjIoErrorState;
 
-static InjIoErrorState * inj_io_error_state;
+static InjIoErrorState *inj_io_error_state;
 
 /* Shared memory init callbacks */
 static shmem_request_hook_type prev_shmem_request_hook = NULL;
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
@@ -73,11 +73,14 @@ if ($sourcedir)
 # might make them so.  For the moment we just hardwire a list of names
 # to add and a list of names to exclude; eventually this may need to be
 # easier to configure.  Note that the typedefs need trailing newlines.
-my @additional = ("bool\n");
+my @additional = map { "$_\n" } qw(
+  bool regex_t regmatch_t regoff
+);
 
 my %excluded = map { +"$_\n" => 1 } qw(
-  ANY FD_SET U abs allocfunc boolean date digit ilist interval iterator other
-  pointer printfunc reference string timestamp type wrap
+  FD_SET LookupSet boolean date duration
+  element_type inquiry iterator other
+  pointer reference rep string timestamp type wrap
 );
 
 # globals
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ typedef struct MemoryContextId`
`38`	`38`	`{`
`39`	`39`	`MemoryContext context;`
`40`	`40`	`int context_id;`
`41`		`-} MemoryContextId;`
	`41`	`+} MemoryContextId;`
`42`	`42`
`43`	`43`	`/*`
`44`	`44`	`* int_list_to_array`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ typedef enum FileCopyMethod`
`17`	`17`	`{`
`18`	`18`	`FILE_COPY_METHOD_COPY,`
`19`	`19`	`FILE_COPY_METHOD_CLONE,`
`20`		`-} FileCopyMethod;`
	`20`	`+} FileCopyMethod;`
`21`	`21`
`22`	`22`	`/* GUC parameters */`
`23`	`23`	`extern PGDLLIMPORT int file_copy_method;`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ typedef struct`
`119`	`119`	`Oid dbId; /* database ID */`
`120`	`120`	`Oid relid; /* relation ID, or 0 if whole`
`121`	`121`	`* RelationSyncCache */`
`122`		`-} SharedInvalRelSyncMsg;`
	`122`	`+} SharedInvalRelSyncMsg;`
`123`	`123`
`124`	`124`	`typedef union`
`125`	`125`	`{`