fix after merge

Author: gsmolk

src/backup.c

@@ -2223,7 +2223,7 @@ parse_filelist_filenames(parray *files, const char *root)
 		if (S_ISREG(file->mode) && file->tblspcOid != 0 &&
 			file->name && file->name[0])
 		{
-			if (file->forkName == INIT)
+			if (file->forkName == init)
 			{
 				/*
 				 * Do not backup files of unlogged relations.

src/delete.c

@@ -966,7 +966,6 @@ do_delete_instance(void)
 {
 	parray		*backup_list;
 	int 		i;
-	int 		rc;
 	char		instance_config_path[MAXPGPATH];
 
 

src/dir.c

@@ -709,22 +709,22 @@ dir_check_file(pgFile *file)
 			{
 				/* Auxiliary fork of the relfile */
 				if (strcmp(fork_name, "vm") == 0)
-					file->forkName = VM;
+					file->forkName = vm;
 
 				else if (strcmp(fork_name, "fsm") == 0)
-					file->forkName = FSM;
+					file->forkName = fsm;
 
 				else if (strcmp(fork_name, "cfm") == 0)
-					file->forkName = CFM;
-
-				else if (strcmp(fork_name, "init") == 0)
-					file->forkName = INIT;
+					file->forkName = cfm;
 
 				else if (strcmp(fork_name, "ptrack") == 0)
-					file->forkName = PTRACK;
+					file->forkName = ptrack;
+
+				else if (strcmp(fork_name, "init") == 0)
+					file->forkName = init;
 
 				/* Do not backup ptrack files */
-				if (file->forkName == PTRACK)
+				if (file->forkName == ptrack)
 					return CHECK_FALSE;
 			}
 			else

src/pg_probackup.h

@@ -120,11 +120,11 @@ typedef enum CompressAlg
 
 typedef enum ForkName
 {
-	VM,
-	FSM,
-	CFM,
-	INIT,
-	PTRACK
+	vm,
+	fsm,
+	cfm,
+	init,
+	ptrack
 } ForkName;
 
 #define INIT_FILE_CRC32(use_crc32c, crc) \