Refactoting. Move new state definitions to a separate header

Author: alubennikova

src/pg_probackup.c

@@ -11,7 +11,7 @@
  *
 
  *
- * TODO:
+ * TODO (see pg_probackup_state.h):
  *
  * Functions that work with a backup catalog accept catalogState,
  * which currently only contains pathes to backup catalog subdirectories
@@ -38,6 +38,7 @@
  */
 
 #include "pg_probackup.h"
+#include "pg_probackup_state.h"
 
 #include "pg_getopt.h"
 #include "streamutil.h"

src/pg_probackup.h

@@ -10,6 +10,7 @@
 #ifndef PG_PROBACKUP_H
 #define PG_PROBACKUP_H
 
+
 #include "postgres_fe.h"
 #include "libpq-fe.h"
 #include "libpq-int.h"
@@ -39,6 +40,9 @@
 #include "datapagemap.h"
 #include "utils/thread.h"
 
+#include "pg_probackup_state.h"
+
+
 #ifdef WIN32
 #define __thread __declspec(thread)
 #else
@@ -755,16 +759,6 @@ extern char	   *backup_path;
 extern char		backup_instance_path[MAXPGPATH];
 extern char		arclog_path[MAXPGPATH];
 
-typedef struct CatalogState
-{
-	/* $BACKUP_PATH */
-	char		catalog_path[MAXPGPATH]; //previously global var backup_path
-	/* $BACKUP_PATH/backups */
-	char		backup_subdir_path[MAXPGPATH];
-	/* $BACKUP_PATH/wal */
-	char		wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
-} CatalogState; 
-
 /* ====== CatalogState (END) ======= */
 
 /* common options */
@@ -797,19 +791,6 @@ extern bool		dry_run;
 
 /* ===== instanceState ===== */
 extern char *instance_name;
-typedef struct InstanceState
-{
-	/* catalog, this instance belongs to */
-	CatalogState *catalog_state;
-
-	char		instance_name[MAXPGPATH]; //previously global var instance_name
-	/* $BACKUP_PATH/backups/instance_name */
-	char		instance_backup_subdir_path[MAXPGPATH];
-	/* $BACKUP_PATH/backups/instance_name */
-	char		instance_wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
-
-	//TODO add config here
-} InstanceState;
 
 /* ===== instanceState (END) ===== */
 

src/pg_probackup_state.h

@@ -0,0 +1,44 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_probackup_state.h: Definitions of internal pg_probackup states 
+ *
+ * Portions Copyright (c) 2021-2018, Postgres Professional
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_PROBACKUP_STATE_H
+#define PG_PROBACKUP_STATE_H
+
+/* ====== CatalogState ======= */
+
+typedef struct CatalogState
+{
+	/* $BACKUP_PATH */
+	char		catalog_path[MAXPGPATH]; //previously global var backup_path
+	/* $BACKUP_PATH/backups */
+	char		backup_subdir_path[MAXPGPATH];
+	/* $BACKUP_PATH/wal */
+	char		wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
+} CatalogState; 
+
+/* ====== CatalogState (END) ======= */
+
+
+/* ===== instanceState ===== */
+typedef struct InstanceState
+{
+	/* catalog, this instance belongs to */
+	CatalogState *catalog_state;
+
+	char		instance_name[MAXPGPATH]; //previously global var instance_name
+	/* $BACKUP_PATH/backups/instance_name */
+	char		instance_backup_subdir_path[MAXPGPATH];
+	/* $BACKUP_PATH/backups/instance_name */
+	char		instance_wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
+
+	//TODO add config here
+} InstanceState;
+
+/* ===== instanceState (END) ===== */
+
+#endif /* PG_PROBACKUP_STATE_H */