@ -38,8 +38,8 @@ static int CopyStreamReceive(PGconn *conn, long timeout, pgsocket stop_socket,
char * * buffer ) ;
static bool ProcessKeepaliveMsg ( PGconn * conn , StreamCtl * stream , char * copybuf ,
int len , XLogRecPtr blockpos , TimestampTz * last_status ) ;
static bool ProcessXLog DataMsg ( PGconn * conn , StreamCtl * stream , char * copybuf , int len ,
XLogRecPtr * blockpos ) ;
static bool ProcessWAL DataMsg ( PGconn * conn , StreamCtl * stream , char * copybuf , int len ,
XLogRecPtr * blockpos ) ;
static PGresult * HandleEndOfCopyStream ( PGconn * conn , StreamCtl * stream , char * copybuf ,
XLogRecPtr blockpos , XLogRecPtr * stoppos ) ;
static bool CheckCopyStreamStop ( PGconn * conn , StreamCtl * stream , XLogRecPtr blockpos ) ;
@ -831,7 +831,7 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream,
}
else if ( copybuf [ 0 ] = = ' w ' )
{
if ( ! ProcessXLog DataMsg ( conn , stream , copybuf , r , & blockpos ) )
if ( ! ProcessWAL DataMsg ( conn , stream , copybuf , r , & blockpos ) )
goto error ;
/*
@ -1041,11 +1041,11 @@ ProcessKeepaliveMsg(PGconn *conn, StreamCtl *stream, char *copybuf, int len,
}
/*
* Process XLog Data message .
* Process WAL Data message .
*/
static bool
ProcessXLog DataMsg ( PGconn * conn , StreamCtl * stream , char * copybuf , int len ,
XLogRecPtr * blockpos )
ProcessWAL DataMsg ( PGconn * conn , StreamCtl * stream , char * copybuf , int len ,
XLogRecPtr * blockpos )
{
int xlogoff ;
int bytes_left ;
@ -1054,13 +1054,13 @@ ProcessXLogDataMsg(PGconn *conn, StreamCtl *stream, char *copybuf, int len,
/*
* Once we ' ve decided we don ' t want to receive any more , just ignore any
* subsequent XLog Data messages .
* subsequent WAL Data messages .
*/
if ( ! ( still_sending ) )
return true ;
/*
* Read the header of the XLog Data message , enclosed in the CopyData
* Read the header of the WAL Data message , enclosed in the CopyData
* message . We only need the WAL location field ( dataStart ) , the rest of
* the header is ignored .
*/
@ -1162,7 +1162,7 @@ ProcessXLogDataMsg(PGconn *conn, StreamCtl *stream, char *copybuf, int len,
return false ;
}
still_sending = false ;
return true ; /* ignore the rest of this XLog Data packet */
return true ; /* ignore the rest of this WAL Data packet */
}
}
}