git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c

index d1060023f9e1d68dc852f81ce1905efe625fe653..2544dcf02fedbd51375dae44e530ba78d6109642 100644 (file)

--- a/src/bin/pg_resetxlog/pg_resetxlog.c

+++ b/src/bin/pg_resetxlog/pg_resetxlog.c

static void GetXLogFiles(void);

static bool ValidXLogFileName(char * fname);

static bool ValidXLogFileHeader(XLogFileName *segfile);

-static bool ValidXLOGPageHeader(XLogPageHeader hdr, uint tli, uint id, uint seg);

+static bool ValidXLOGPageHeader(XLogPageHeader hdr, uint32 tli, uint32 id, uint32 seg);

static bool CmpXLogFileOT(XLogFileName * f1, XLogFileName *f2);

static bool IsNextSeg(XLogFileName *prev, XLogFileName *cur);

static void InsertXLogFile( char * fname );

static bool

ValidXLogFileName(char * fname)

{

- uint logTLI, logId, logSeg;

+ uint32 logTLI, logId, logSeg;

if (strlen(fname) != 24 ||

strspn(fname, "0123456789ABCDEF") != 24 ||

sscanf(fname, "%8x%8x%8x", &logTLI, &logId, &logSeg) != 3)

}

static bool

-ValidXLOGPageHeader(XLogPageHeader hdr, uint tli, uint id, uint seg)

+ValidXLOGPageHeader(XLogPageHeader hdr, uint32 tli, uint32 id, uint32 seg)

{

XLogRecPtr recaddr;