Rename XLogFileName to XLogFileNameLong

Michael Paquier · Michael Paquier · commit bd75d08ef341 · 2013-12-10T03:29:47.000+09:00
This is a lazy solution to avoid a conflict with the existing API in
xlog_internal.h, and should be corrected to use the one in core.
diff --git a/pg_rman.h b/pg_rman.h
@@ -343,7 +343,7 @@ extern bool is_pg_running(void);
 	} while (0)
 
 #define MAXFNAMELEN		64
-#define XLogFileName(fname, tli, log, seg)	\
+#define XLogFileNameLong(fname, tli, log, seg)	\
 	snprintf(fname, MAXFNAMELEN, "%08X%08X%08X", tli, log, seg)
 
 #endif /* PG_RMAN_H */
diff --git a/restore.c b/restore.c
@@ -1004,7 +1004,7 @@ search_next_wal(const char *path, uint32 *needId, uint32 *needSeg, parray *timel
 		{
 			pgTimeLine *timeline = (pgTimeLine *) parray_get(timelines, i);
 
-			XLogFileName(xlogfname, timeline->tli, *needId, *needSeg);
+			XLogFileNameLong(xlogfname, timeline->tli, *needId, *needSeg);
 			join_path_components(xlogpath, path, xlogfname);
 
 			if (stat(xlogpath, &st) == 0)

Original file line number	Diff line number	Diff line change
`@@ -1004,7 +1004,7 @@ search_next_wal(const char path, uint32 needId, uint32 needSeg, parray timel`
`1004`	`1004`	`{`
`1005`	`1005`	`pgTimeLine timeline = (pgTimeLine ) parray_get(timelines, i);`
`1006`	`1006`
`1007`		`- XLogFileName(xlogfname, timeline->tli, needId, needSeg);`
	`1007`	`+ XLogFileNameLong(xlogfname, timeline->tli, needId, needSeg);`
`1008`	`1008`	`join_path_components(xlogpath, path, xlogfname);`
`1009`	`1009`
`1010`	`1010`	`if (stat(xlogpath, &st) == 0)`