From 7e06ca28697b365561371b2843d88c4caaccd347 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 18 Oct 2023 21:31:22 -0700 Subject: [PATCH v4 4/4] Update typedefs, reindent using the new build targets From debian sid and macos ventura. --- contrib/sepgsql/hooks.c | 2 +- contrib/sepgsql/label.c | 2 +- contrib/sepgsql/uavc.c | 2 +- src/tools/pgindent/typedefs.list | 14 +++++++++++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c index fa734763602..443e30be994 100644 --- a/contrib/sepgsql/hooks.c +++ b/contrib/sepgsql/hooks.c @@ -50,7 +50,7 @@ typedef struct * command. Elsewhere (including the case of default) NULL. */ const char *createdb_dtemplate; -} sepgsql_context_info_t; +} sepgsql_context_info_t; static sepgsql_context_info_t sepgsql_context_info; diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index 38ff4068ff2..e13640dc4d9 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -67,7 +67,7 @@ typedef struct { SubTransactionId subid; char *label; -} pending_label; +} pending_label; /* * sepgsql_get_client_label diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c index 6e3a892da24..6f63a19aa96 100644 --- a/contrib/sepgsql/uavc.c +++ b/contrib/sepgsql/uavc.c @@ -44,7 +44,7 @@ typedef struct /* true, if tcontext is valid */ char *ncontext; /* temporary scontext on execution of trusted * procedure, or NULL elsewhere */ -} avc_cache; +} avc_cache; /* * Declaration of static variables diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index e69bb671bf8..d6178386252 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2,6 +2,7 @@ ACCESS_ALLOWED_ACE ACL ACL_SIZE_INFORMATION AFFIX +ANY ASN1_INTEGER ASN1_OBJECT ASN1_OCTET_STRING @@ -1275,9 +1276,9 @@ JsonManifestWALRangeField JsonObjectAgg JsonObjectConstructor JsonOutput -JsonParseExpr JsonParseContext JsonParseErrorType +JsonParseExpr JsonPath JsonPathBool JsonPathExecContext @@ -1913,7 +1914,6 @@ ParallelHashJoinBatch ParallelHashJoinBatchAccessor ParallelHashJoinState ParallelIndexScanDesc -ParallelReadyList ParallelSlot ParallelSlotArray ParallelSlotResultHandler @@ -3135,6 +3135,7 @@ _ino_t _locale_t _resultmap _stringlist +access_vector_t acquireLocksOnSubLinks_context add_nulling_relids_context adjust_appendrel_attrs_context @@ -3167,6 +3168,7 @@ assign_collations_context auth_password_hook_typ autovac_table av_relation +avc_cache avl_dbase avl_node avl_tree @@ -3247,6 +3249,7 @@ crosstab_HashEnt crosstab_cat_desc datapagemap_iterator_t datapagemap_t +date dateKEY datetkn dce_uuid_t @@ -3402,6 +3405,7 @@ indexed_tlist inet inetKEY inet_struct +initRowMethod init_function inline_cte_walker_context inline_error_callback_arg @@ -3418,6 +3422,7 @@ int64 int64KEY int8 internalPQconninfoOption +interval intptr_t intset_internal_node intset_leaf_node @@ -3519,6 +3524,7 @@ parse_error_callback_arg parser_context partition_method_t pendingPosition +pending_label pgParameterStatus pg_atomic_flag pg_atomic_uint32 @@ -3710,7 +3716,9 @@ saophash_hash save_buffer scram_state scram_state_enum +security_class_t sem_t +sepgsql_context_info_t sequence_magic set_join_pathlist_hook_type set_rel_pathlist_hook_type @@ -3792,6 +3800,7 @@ time_t timeout_handler_proc timeout_params timerCA +timestamp tlist_vinfo toast_compress_header tokenize_error_callback_arg @@ -3869,7 +3878,6 @@ wchar2mb_with_len_converter wchar_t win32_deadchild_waitinfo wint_t -worker_spi_state worker_state worktable wrap -- 2.38.0