From: Christian Kruse <cjk@defunct.ch>
Date: Fri, 9 May 2014 09:50:52 +0000 (+0200)
Subject: bdr: fix: use correct datatypes in various loops
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=cf462634eea48cc0d34ec7a775e3839a1ec07608;p=users%2Fandresfreund%2Fpostgres.git

bdr: fix: use correct datatypes in various loops

This avoids compiler warnings for signed vs unsigned comparison.
---

diff --git a/contrib/bdr/bdr.c b/contrib/bdr/bdr.c
index 0f3f53a912..8b1768bff5 100644
--- a/contrib/bdr/bdr.c
+++ b/contrib/bdr/bdr.c
@@ -784,7 +784,7 @@ bdr_create_con_gucs(char  *name,
 					char **database_initcons,
 					BdrConnectionConfig **out_config)
 {
-	int			off;
+	Size		off;
 	char	   *errmsg = NULL;
 	PQconninfoOption *options;
 	PQconninfoOption *cur_option;
diff --git a/contrib/bdr/bdr_count.c b/contrib/bdr/bdr_count.c
index 55ddfdfd89..dabf6f36e2 100644
--- a/contrib/bdr/bdr_count.c
+++ b/contrib/bdr/bdr_count.c
@@ -297,7 +297,7 @@ pg_stat_get_bdr(PG_FUNCTION_ARGS)
 	Tuplestorestate *tupstore;
 	MemoryContext per_query_ctx;
 	MemoryContext oldcontext;
-	int			current_offset;
+	size_t		current_offset;
 
 	if (!superuser())
 		elog(ERROR, "blarg");
@@ -453,7 +453,7 @@ bdr_count_unserialize(void)
 	int			fd;
 	const char *path = "global/bdr.stat";
 	BdrCountSerialize serial;
-	Size		read_size;
+	ssize_t		read_size;
 
 	if (BdrCountCtl == NULL)
 		elog(ERROR, "cannot use bdr statistics function without loading bdr");
diff --git a/contrib/bdr/bdr_init_replica.c b/contrib/bdr/bdr_init_replica.c
index 40d8d45167..ad5f73b885 100644
--- a/contrib/bdr/bdr_init_replica.c
+++ b/contrib/bdr/bdr_init_replica.c
@@ -69,7 +69,7 @@ static void bdr_catchup_to_lsn(int cfg_index,
 static BdrWorker*
 find_init_replica_worker(Name dbname)
 {
-	Size off;
+	int off;
 
 	Assert(LWLockHeldByMe(BdrWorkerCtl->lock));
 	/* Check whether one of our connections has init_replica set */
diff --git a/contrib/bdr/bdr_seq.c b/contrib/bdr/bdr_seq.c
index 4ed12f6711..b41756aa89 100644
--- a/contrib/bdr/bdr_seq.c
+++ b/contrib/bdr/bdr_seq.c
@@ -526,7 +526,7 @@ bdr_sequencer_shmem_init(int nnodes, int sequencers)
 void
 bdr_sequencer_wakeup(void)
 {
-	int off;
+	size_t off;
 	BdrSequencerSlot *slot;