Fix argument length in client_message_shortcut in the arbiter code.

kvap · kvap · commit aa2c91a43600 · 2015-10-14T14:27:28.000+03:00
diff --git a/contrib/pg_dtm/dtmd/include/server.h b/contrib/pg_dtm/dtmd/include/server.h
@@ -2,6 +2,7 @@
 #define SERVER_H
 
 #include <stdbool.h>
+#include "int.h"
 
 /*
  * You should not want to know what is inside those structures.
@@ -95,6 +96,6 @@ bool client_message_finish(client_t client);
  *
  * Returns 'true' on success, 'false' otherwise.
  */
-bool client_message_shortcut(client_t client, long long arg);
+bool client_message_shortcut(client_t client, xid_t arg);
 
 #endif
diff --git a/contrib/pg_dtm/dtmd/src/clog.c b/contrib/pg_dtm/dtmd/src/clog.c
@@ -133,7 +133,7 @@ int clog_read(clog_t clog, xid_t xid) {
 bool clog_write(clog_t clog, xid_t xid, int status) {
 	clogfile_t *file = clog_xid_to_file(clog, xid);
 	if (!file) {
-		debug("xid %016llx out of range, creating the file\n", xid);
+		debug("xid %u out of range, creating the file\n", xid);
 		clogfile_t newfile;
 		if (!clogfile_open_by_id(&newfile, clog->datadir, XID_TO_FILEID(xid), true)) {
 			shout(
diff --git a/contrib/pg_dtm/dtmd/src/server.c b/contrib/pg_dtm/dtmd/src/server.c
@@ -325,7 +325,7 @@ bool client_message_finish(client_t client) {
 	return stream_message_finish(client->stream);
 }
 
-bool client_message_shortcut(client_t client, long long arg) {
+bool client_message_shortcut(client_t client, xid_t arg) {
 	if (!stream_message_start(client->stream, client->chan)) {
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ bool client_message_finish(client_t client) {`
`325`	`325`	`return stream_message_finish(client->stream);`
`326`	`326`	`}`
`327`	`327`
`328`		`-bool client_message_shortcut(client_t client, long long arg) {`
	`328`	`+bool client_message_shortcut(client_t client, xid_t arg) {`
`329`	`329`	`if (!stream_message_start(client->stream, client->chan)) {`
`330`	`330`	`return false;`
`331`	`331`	`}`