Commit cae56719 authored by Bruce Momjian's avatar Bruce Momjian

In pg_resetxlog.c, uint -> uint32, for Win32 port.

parent 1865fb66
...@@ -109,7 +109,7 @@ static void usage(void); ...@@ -109,7 +109,7 @@ static void usage(void);
static void GetXLogFiles(void); static void GetXLogFiles(void);
static bool ValidXLogFileName(char * fname); static bool ValidXLogFileName(char * fname);
static bool ValidXLogFileHeader(XLogFileName *segfile); 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 CmpXLogFileOT(XLogFileName * f1, XLogFileName *f2);
static bool IsNextSeg(XLogFileName *prev, XLogFileName *cur); static bool IsNextSeg(XLogFileName *prev, XLogFileName *cur);
static void InsertXLogFile( char * fname ); static void InsertXLogFile( char * fname );
...@@ -1204,7 +1204,7 @@ SelectStartXLog( void ) ...@@ -1204,7 +1204,7 @@ SelectStartXLog( void )
static bool static bool
ValidXLogFileName(char * fname) ValidXLogFileName(char * fname)
{ {
uint logTLI, logId, logSeg; uint32 logTLI, logId, logSeg;
if (strlen(fname) != 24 || if (strlen(fname) != 24 ||
strspn(fname, "0123456789ABCDEF") != 24 || strspn(fname, "0123456789ABCDEF") != 24 ||
sscanf(fname, "%8x%8x%8x", &logTLI, &logId, &logSeg) != 3) sscanf(fname, "%8x%8x%8x", &logTLI, &logId, &logSeg) != 3)
...@@ -1243,7 +1243,7 @@ ValidXLogFileHeader(XLogFileName *segfile) ...@@ -1243,7 +1243,7 @@ ValidXLogFileHeader(XLogFileName *segfile)
} }
static bool static bool
ValidXLOGPageHeader(XLogPageHeader hdr, uint tli, uint id, uint seg) ValidXLOGPageHeader(XLogPageHeader hdr, uint32 tli, uint32 id, uint32 seg)
{ {
XLogRecPtr recaddr; XLogRecPtr recaddr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment