Pass Size as a 2nd argument for snprintf() in tablesync.c.

Amit Kapila · Amit Kapila · commit a932824dfe06 · 2022-09-21T10:20:37.000+05:30
Previously the following snprintf() wrappers: * ReplicationSlotNameForTablesync() * ReplicationOriginNameForTablesync() ... used int as a second argument of snprintf() while the actual type of it is size_t. Although it doesn't fail at present better replace it with Size for consistency with the rest of the system. Author: Aleksander Alekseev Reviewed-By: Peter Smith Discussion: https://postgr.es/m/CAHut%2BPsa8hhfSE6ozUK-ih7GkQziAVAf4f3bqiXEj2nQiu-43g%40mail.gmail.com
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
@@ -1187,7 +1187,7 @@ copy_table(Relation rel)
  */
 void
 ReplicationSlotNameForTablesync(Oid suboid, Oid relid,
-								char *syncslotname, int szslot)
+								char *syncslotname, Size szslot)
 {
 	snprintf(syncslotname, szslot, "pg_%u_sync_%u_" UINT64_FORMAT, suboid,
 			 relid, GetSystemIdentifier());
@@ -1200,7 +1200,7 @@ ReplicationSlotNameForTablesync(Oid suboid, Oid relid,
  */
 void
 ReplicationOriginNameForTablesync(Oid suboid, Oid relid,
-								  char *originname, int szorgname)
+								  char *originname, Size szorgname)
 {
 	snprintf(originname, szorgname, "pg_%u_%u", suboid, relid);
 }
diff --git a/src/include/replication/slot.h b/src/include/replication/slot.h
@@ -218,7 +218,7 @@ extern void ReplicationSlotsDropDBSlots(Oid dboid);
 extern bool InvalidateObsoleteReplicationSlots(XLogSegNo oldestSegno);
 extern ReplicationSlot *SearchNamedReplicationSlot(const char *name, bool need_lock);
 extern int	ReplicationSlotIndex(ReplicationSlot *slot);
-extern void ReplicationSlotNameForTablesync(Oid suboid, Oid relid, char *syncslotname, int szslot);
+extern void ReplicationSlotNameForTablesync(Oid suboid, Oid relid, char *syncslotname, Size szslot);
 extern void ReplicationSlotDropAtPubNode(WalReceiverConn *wrconn, char *slotname, bool missing_ok);
 
 extern void StartupReplicationSlots(void);
diff --git a/src/include/replication/worker_internal.h b/src/include/replication/worker_internal.h
@@ -93,7 +93,7 @@ extern void logicalrep_worker_wakeup_ptr(LogicalRepWorker *worker);
 extern int	logicalrep_sync_worker_count(Oid subid);
 
 extern void ReplicationOriginNameForTablesync(Oid suboid, Oid relid,
-											  char *originname, int szorgname);
+											  char *originname, Size szorgname);
 extern char *LogicalRepSyncTableStart(XLogRecPtr *origin_startpos);
 
 extern bool AllTablesyncsReady(void);

Original file line number	Diff line number	Diff line change
`@@ -1187,7 +1187,7 @@ copy_table(Relation rel)`
`1187`	`1187`	`*/`
`1188`	`1188`	`void`
`1189`	`1189`	`ReplicationSlotNameForTablesync(Oid suboid, Oid relid,`
`1190`		`- char *syncslotname, int szslot)`
	`1190`	`+ char *syncslotname, Size szslot)`
`1191`	`1191`	`{`
`1192`	`1192`	`snprintf(syncslotname, szslot, "pg_%u_sync_%u_" UINT64_FORMAT, suboid,`
`1193`	`1193`	`relid, GetSystemIdentifier());`
`@@ -1200,7 +1200,7 @@ ReplicationSlotNameForTablesync(Oid suboid, Oid relid,`
`1200`	`1200`	`*/`
`1201`	`1201`	`void`
`1202`	`1202`	`ReplicationOriginNameForTablesync(Oid suboid, Oid relid,`
`1203`		`- char *originname, int szorgname)`
	`1203`	`+ char *originname, Size szorgname)`
`1204`	`1204`	`{`
`1205`	`1205`	`snprintf(originname, szorgname, "pg_%u_%u", suboid, relid);`
`1206`	`1206`	`}`