Fix overridden callbacks in pg_rewind.

danielgustafsson · pull[bot] · commit 1ae3ab9f9bde · 2024-04-09T05:02:06.000Z
The <source>_traverse_files functions take a callback for processing files, but both the local and libpq source implementations called the function directly without using the callback argument. While there is no bug right now as the function called is the same as the callback, fix by calling the callback to reduce the risk of subtle bugs in the future. Author: Junwang Zhao <zhjwpku@gmail.com> Reviewed-by: Richard Guo <guofenglinux@gmail.com> Discussion: https://postgr.es/m/CAEG8a3Jdwgh+PZr2zh1=t8apA4Yz8tKq+uubPqoCt14nvWKHEw@mail.gmail.com
diff --git a/src/bin/pg_rewind/libpq_source.c b/src/bin/pg_rewind/libpq_source.c
@@ -304,7 +304,7 @@ libpq_traverse_files(rewind_source *source, process_file_callback_t callback)
 		else
 			type = FILE_TYPE_REGULAR;
 
-		process_source_file(path, type, filesize, link_target);
+		callback(path, type, filesize, link_target);
 	}
 	PQclear(res);
 }
diff --git a/src/bin/pg_rewind/local_source.c b/src/bin/pg_rewind/local_source.c
@@ -59,7 +59,7 @@ init_local_source(const char *datadir)
 static void
 local_traverse_files(rewind_source *source, process_file_callback_t callback)
 {
-	traverse_datadir(((local_source *) source)->datadir, &process_source_file);
+	traverse_datadir(((local_source *) source)->datadir, callback);
 }
 
 static char *

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ libpq_traverse_files(rewind_source *source, process_file_callback_t callback)`
`304`	`304`	`else`
`305`	`305`	`type = FILE_TYPE_REGULAR;`
`306`	`306`
`307`		`- process_source_file(path, type, filesize, link_target);`
	`307`	`+ callback(path, type, filesize, link_target);`
`308`	`308`	`}`
`309`	`309`	`PQclear(res);`
`310`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ init_local_source(const char *datadir)`
`59`	`59`	`static void`
`60`	`60`	`local_traverse_files(rewind_source *source, process_file_callback_t callback)`
`61`	`61`	`{`
`62`		`- traverse_datadir(((local_source *) source)->datadir, &process_source_file);`
	`62`	`+ traverse_datadir(((local_source *) source)->datadir, callback);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`static char *`