@@ -101,31 +101,8 @@ getSchemaData(Archive *fout, int *numTablesPtr)
101101 ExtensionInfo * extinfo ;
102102 InhInfo * inhinfo ;
103103 int numTables ;
104- int numTypes ;
105- int numFuncs ;
106- int numOperators ;
107- int numCollations ;
108- int numNamespaces ;
109104 int numExtensions ;
110- int numPublications ;
111- int numAggregates ;
112105 int numInherits ;
113- int numRules ;
114- int numProcLangs ;
115- int numCasts ;
116- int numTransforms ;
117- int numAccessMethods ;
118- int numOpclasses ;
119- int numOpfamilies ;
120- int numConversions ;
121- int numTSParsers ;
122- int numTSTemplates ;
123- int numTSDicts ;
124- int numTSConfigs ;
125- int numForeignDataWrappers ;
126- int numForeignServers ;
127- int numDefaultACLs ;
128- int numEventTriggers ;
129106
130107 /*
131108 * We must read extensions and extension membership info first, because
@@ -139,7 +116,7 @@ getSchemaData(Archive *fout, int *numTablesPtr)
139116 getExtensionMembership (fout , extinfo , numExtensions );
140117
141118 pg_log_info ("reading schemas" );
142- ( void ) getNamespaces (fout , & numNamespaces );
119+ getNamespaces (fout );
143120
144121 /*
145122 * getTables should be done as soon as possible, so as to minimize the
@@ -153,69 +130,69 @@ getSchemaData(Archive *fout, int *numTablesPtr)
153130 getOwnedSeqs (fout , tblinfo , numTables );
154131
155132 pg_log_info ("reading user-defined functions" );
156- ( void ) getFuncs (fout , & numFuncs );
133+ getFuncs (fout );
157134
158135 /* this must be after getTables and getFuncs */
159136 pg_log_info ("reading user-defined types" );
160- ( void ) getTypes (fout , & numTypes );
137+ getTypes (fout );
161138
162139 /* this must be after getFuncs, too */
163140 pg_log_info ("reading procedural languages" );
164- getProcLangs (fout , & numProcLangs );
141+ getProcLangs (fout );
165142
166143 pg_log_info ("reading user-defined aggregate functions" );
167- getAggregates (fout , & numAggregates );
144+ getAggregates (fout );
168145
169146 pg_log_info ("reading user-defined operators" );
170- ( void ) getOperators (fout , & numOperators );
147+ getOperators (fout );
171148
172149 pg_log_info ("reading user-defined access methods" );
173- getAccessMethods (fout , & numAccessMethods );
150+ getAccessMethods (fout );
174151
175152 pg_log_info ("reading user-defined operator classes" );
176- getOpclasses (fout , & numOpclasses );
153+ getOpclasses (fout );
177154
178155 pg_log_info ("reading user-defined operator families" );
179- getOpfamilies (fout , & numOpfamilies );
156+ getOpfamilies (fout );
180157
181158 pg_log_info ("reading user-defined text search parsers" );
182- getTSParsers (fout , & numTSParsers );
159+ getTSParsers (fout );
183160
184161 pg_log_info ("reading user-defined text search templates" );
185- getTSTemplates (fout , & numTSTemplates );
162+ getTSTemplates (fout );
186163
187164 pg_log_info ("reading user-defined text search dictionaries" );
188- getTSDictionaries (fout , & numTSDicts );
165+ getTSDictionaries (fout );
189166
190167 pg_log_info ("reading user-defined text search configurations" );
191- getTSConfigurations (fout , & numTSConfigs );
168+ getTSConfigurations (fout );
192169
193170 pg_log_info ("reading user-defined foreign-data wrappers" );
194- getForeignDataWrappers (fout , & numForeignDataWrappers );
171+ getForeignDataWrappers (fout );
195172
196173 pg_log_info ("reading user-defined foreign servers" );
197- getForeignServers (fout , & numForeignServers );
174+ getForeignServers (fout );
198175
199176 pg_log_info ("reading default privileges" );
200- getDefaultACLs (fout , & numDefaultACLs );
177+ getDefaultACLs (fout );
201178
202179 pg_log_info ("reading user-defined collations" );
203- ( void ) getCollations (fout , & numCollations );
180+ getCollations (fout );
204181
205182 pg_log_info ("reading user-defined conversions" );
206- getConversions (fout , & numConversions );
183+ getConversions (fout );
207184
208185 pg_log_info ("reading type casts" );
209- getCasts (fout , & numCasts );
186+ getCasts (fout );
210187
211188 pg_log_info ("reading transforms" );
212- getTransforms (fout , & numTransforms );
189+ getTransforms (fout );
213190
214191 pg_log_info ("reading table inheritance information" );
215192 inhinfo = getInherits (fout , & numInherits );
216193
217194 pg_log_info ("reading event triggers" );
218- getEventTriggers (fout , & numEventTriggers );
195+ getEventTriggers (fout );
219196
220197 /* Identify extension configuration tables that should be dumped */
221198 pg_log_info ("finding extension tables" );
@@ -250,13 +227,13 @@ getSchemaData(Archive *fout, int *numTablesPtr)
250227 getTriggers (fout , tblinfo , numTables );
251228
252229 pg_log_info ("reading rewrite rules" );
253- getRules (fout , & numRules );
230+ getRules (fout );
254231
255232 pg_log_info ("reading policies" );
256233 getPolicies (fout , tblinfo , numTables );
257234
258235 pg_log_info ("reading publications" );
259- ( void ) getPublications (fout , & numPublications );
236+ getPublications (fout );
260237
261238 pg_log_info ("reading publication membership of tables" );
262239 getPublicationTables (fout , tblinfo , numTables );
0 commit comments