github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-23 07:06:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

repmgr: simplify LSN parsing

Browse Source 
Also silences a compiler warning.
This commit is contained in:
Ian Barwick
2016-10-10 22:56:49 +09:00
parent 30c5cc86f3
commit 2bc877114c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
repmgr.c
View File

@@ -3900,29 +3900,31 @@ stop_backup:
exit(retval);
}
static bool
static void
parse_lsn(XLogRecPtr *ptr, const char *str)
{
uint32 high, low;
if (sscanf(str, "%x/%x", &high, &low) != 2)
return false;
return;
*ptr = (((XLogRecPtr)high) << 32) + (XLogRecPtr)low;
return true;
return;
}
static XLogRecPtr
parse_label_lsn(const char *label_key, const char *label_value)
{
XLogRecPtr ptr;
XLogRecPtr ptr = InvalidXLogRecPtr;
if (!parse_lsn(&ptr, label_value))
parse_lsn(&ptr, label_value);
/* parse_lsn() will not modify ptr if it can't parse the label value */
if (ptr == InvalidXLogRecPtr)
{
log_err(_("Couldn't parse backup label entry \"%s: %s\" as lsn"),
label_key, label_value);
return InvalidXLogRecPtr;
}
return ptr;