cleanup

kelvich · kelvich · commit f32c85616e6f · 2016-03-10T16:40:55.000+03:00
diff --git a/contrib/pglogical/pglogical_apply.c b/contrib/pglogical/pglogical_apply.c
@@ -369,7 +369,6 @@ UserTableUpdateOpenIndexes(EState *estate, TupleTableSlot *slot)
 											   &slot->tts_tuple->t_self,
 											   estate, false, NULL, NIL);
 
-
 		/* FIXME: recheck the indexes */
 		if (recheckIndexes != NIL)
 			ereport(ERROR,
@@ -477,7 +476,6 @@ handle_insert(StringInfo s)
 	estate = create_estate_for_relation(rel->rel);
 	econtext = GetPerTupleExprContext(estate);
 
-
 	PushActiveSnapshot(GetTransactionSnapshot());
 
 	MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
diff --git a/contrib/pglogical/pglogical_proto.h b/contrib/pglogical/pglogical_proto.h
@@ -29,7 +29,7 @@ typedef struct PGLogicalTupleData
 #define PGLOGICAL_COMMIT_PREPARED	0x02
 #define PGLOGICAL_ABORT_PREPARED	0x03
 
-#define PGLOGICAL_XACT_EVENT(flags)	(flags & 0x3)
+#define PGLOGICAL_XACT_EVENT(flags)	(flags & 0x03)
 
 extern void pglogical_read_begin(StringInfo in, XLogRecPtr *remote_lsn,
 					  TimestampTz *committime, TransactionId *remote_xid);
diff --git a/contrib/pglogical_output/pglogical_proto_native.c b/contrib/pglogical_output/pglogical_proto_native.c
@@ -22,6 +22,7 @@
 #include "access/tuptoaster.h"
 #include "access/xact.h"
 #include "access/twophase.h"
+
 #include "catalog/catversion.h"
 #include "catalog/index.h"
 
diff --git a/contrib/pglogical_output/pglogical_proto_native.h b/contrib/pglogical_output/pglogical_proto_native.h
@@ -28,7 +28,7 @@
 #define PGLOGICAL_COMMIT_PREPARED	0x02
 #define PGLOGICAL_ABORT_PREPARED	0x03
 
-#define PGLOGICAL_XACT_EVENT(flags)	(flags & 0x3)
+#define PGLOGICAL_XACT_EVENT(flags)	(flags & 0x03)
 
 extern void pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel,
 							struct PGLRelMetaCacheEntry *cache_entry);
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -1258,12 +1258,12 @@ ParsePrepareRecord(uint8 info, char *xlrec, xl_xact_parsed_prepare *parsed)
 
 	parsed->xnodes = (RelFileNode *) bufptr;
 	bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileNode));
-	
+
 	/* Ignoring abortrels? */
 	bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileNode));
-	
+
 	parsed->msgs = (SharedInvalidationMessage *) bufptr;
-	bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage));	
+	bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage));
 }
 
 
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5311,7 +5311,9 @@ XactLogAbortRecord(TimestampTz abort_time,
 	{
 		XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);
 		XLogRegisterData((char *) twophase_gid, xl_twophase.gidlen);
-	}	if (xl_xinfo.xinfo & XACT_XINFO_HAS_DBINFO)
+	}
+
+	if (xl_xinfo.xinfo & XACT_XINFO_HAS_DBINFO)
 		XLogRegisterData((char *) (&xl_dbinfo), sizeof(xl_dbinfo));
 
 	return XLogInsert(RM_XACT_ID, info);
