Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc9c25a9

Browse files
committed
Clean up unnecessary unportability and compiler warnings by removing the
cmp parameter for pg_scandir(). The code failed to support this anywayfor Sun/Windows, so pretending we could accept a parameter other thanNULL was just asking for trouble.
1 parentb460b5c commitc9c25a9

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

‎contrib/pg_upgrade/file.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ copy_file(const char *srcfile, const char *dstfile, bool force)
239239
*/
240240
int
241241
pg_scandir(migratorContext*ctx,constchar*dirname,
242-
structdirent***namelist,int (*selector) (conststructdirent*),
243-
int (*cmp) (constvoid*,constvoid*))
242+
structdirent***namelist,
243+
int (*selector) (conststructdirent*))
244244
{
245245
#if defined(sun)|| defined(WIN32)
246246
returnpg_scandir_internal(ctx,dirname,namelist,selector);
@@ -258,10 +258,10 @@ pg_scandir(migratorContext *ctx, const char *dirname,
258258
*/
259259
#elif defined(freebsd)|| defined(bsdi)|| defined(darwin)|| defined(openbsd)
260260
/* no const */
261-
returnscandir(dirname,namelist, (int (*) (structdirent*))selector,cmp);
261+
returnscandir(dirname,namelist, (int (*) (structdirent*))selector,NULL);
262262
#else
263263
/* use const */
264-
returnscandir(dirname,namelist,selector,cmp);
264+
returnscandir(dirname,namelist,selector,NULL);
265265
#endif
266266
}
267267

‎contrib/pg_upgrade/pg_upgrade.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ typedef void *pageCnvCtx;
330330

331331
intdir_matching_filenames(conststructdirent*scan_ent);
332332
intpg_scandir(migratorContext*ctx,constchar*dirname,
333-
structdirent***namelist,int (*selector) (conststructdirent*),
334-
int (*cmp) (constvoid*,constvoid*));
333+
structdirent***namelist,
334+
int (*selector) (conststructdirent*));
335335
constchar*copyAndUpdateFile(migratorContext*ctx,
336336
pageCnvCtx*pageConverter,constchar*src,
337337
constchar*dst,boolforce);

‎contrib/pg_upgrade/relfilenode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ transfer_single_new_db(migratorContext *ctx, pageCnvCtx *pageConverter,
140140
* Now copy/link any fsm and vm files, if they exist
141141
*/
142142
snprintf(scandir_file_pattern,sizeof(scandir_file_pattern),"%u_",maps[mapnum].old);
143-
numFiles=pg_scandir(ctx,maps[mapnum].old_file,&namelist,dir_matching_filenames,NULL);
143+
numFiles=pg_scandir(ctx,maps[mapnum].old_file,&namelist,dir_matching_filenames);
144144

145145
while (numFiles--)
146146
{
@@ -168,7 +168,7 @@ transfer_single_new_db(migratorContext *ctx, pageCnvCtx *pageConverter,
168168
* copied.
169169
*/
170170
snprintf(scandir_file_pattern,sizeof(scandir_file_pattern),"%u.",maps[mapnum].old);
171-
numFiles=pg_scandir(ctx,maps[mapnum].old_file,&namelist,dir_matching_filenames,NULL);
171+
numFiles=pg_scandir(ctx,maps[mapnum].old_file,&namelist,dir_matching_filenames);
172172

173173
while (numFiles--)
174174
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp