[PBCKP-314] move err_i to the beginning of a function.

Author: Sergey Fukanchik

src/backup.c

@@ -111,6 +111,8 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 	time_t		start_time, end_time;
 	char		pretty_time[20];
 	char		pretty_bytes[20];
+	err_i		err = $noerr();
+
 
 	elog(INFO, "Database backup start");
 	if(current.external_dir_str)
@@ -250,7 +252,6 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 	if (current.stream)
 	{
 		char stream_xlog_path[MAXPGPATH];
-		err_i err;
 
 		join_path_components(stream_xlog_path, current.database_dir, PG_XLOG_DIR);
 		err = $i(pioMakeDir, current.backup_location, .path = stream_xlog_path,
@@ -406,15 +407,11 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 				join_path_components(dirpath, current.database_dir, file->rel_path);
 
 			elog(LOG, "Create directory '%s'", dirpath);
+			err = $i(pioMakeDir, current.backup_location, .path = dirpath,
+					 .mode = DIR_PERMISSION, .strict = false);
+			if ($haserr(err))
 			{
-				err_i err;
-
-				err = $i(pioMakeDir, current.backup_location, .path = dirpath,
-						 .mode = DIR_PERMISSION, .strict = false);
-				if ($haserr(err))
-				{
-					elog(WARNING, "%s", $errmsg(err));
-				}
+				elog(WARNING, "%s", $errmsg(err));
 			}
 		}
 

src/catalog.c

@@ -1461,7 +1461,7 @@ pgBackupInitDir(pgBackup *backup, const char *backup_instance_path)
 	int	i;
 	char	temp[MAXPGPATH];
 	parray *subdirs;
-	err_i	err;
+	err_i	err = $noerr();
 
 	/* Try to create backup directory at first */
 	err = create_backup_dir(backup, backup_instance_path);
@@ -1500,7 +1500,6 @@ pgBackupInitDir(pgBackup *backup, const char *backup_instance_path)
 	/* create directories for actual backup files */
 	for (i = 0; i < parray_num(subdirs); i++)
 	{
-		err_i err;
 		join_path_components(temp, backup->root_dir, parray_get(subdirs, i));
 		err = $i(pioMakeDir, backup->backup_location, .path = temp,
 				 .mode = DIR_PERMISSION, .strict = false);

src/catchup.c

@@ -633,6 +633,8 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
 	ssize_t		transfered_datafiles_bytes = 0;
 	ssize_t		transfered_walfiles_bytes = 0;
 	char		pretty_source_bytes[20];
+	err_i		err = $noerr();
+
 
 	source_conn = catchup_init_state(&source_node_info, source_pgdata, dest_pgdata);
 	catchup_preflight_checks(&source_node_info, source_conn, source_pgdata, dest_pgdata);
@@ -705,8 +707,6 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
 	join_path_components(dest_xlog_path, dest_pgdata, PG_XLOG_DIR);
 	if (!dry_run)
 	{
-		err_i err;
-
 		err = $i(pioMakeDir, local_location, .path = dest_xlog_path,
 				 .mode = DIR_PERMISSION, .strict = false);
 		if($haserr(err))
@@ -829,8 +829,6 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
 			elog(LOG, "Create directory '%s'", dirpath);
 			if (!dry_run)
 			{
-				err_i err;
-
 				err = $i(pioMakeDir, local_location, .path = dirpath,
 						 .mode = DIR_PERMISSION, .strict = false);
 				if ($haserr(err))
@@ -870,8 +868,6 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads,
 
 			if (!dry_run)
 			{
-				err_i err;
-
 				/* create tablespace directory */
 				err = $i(pioMakeDir, local_location, .path = linked_path,
 						 .mode = file->mode, .strict = false);

src/dir.c

@@ -852,6 +852,8 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
 	parray		*links = NULL;
 	mode_t		pg_tablespace_mode = DIR_PERMISSION;
 	char		to_path[MAXPGPATH];
+	err_i		err = $noerr();
+
 
 	if (waldir_path && !dir_is_empty(waldir_path, location))
 	{
@@ -933,15 +935,11 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
 				waldir_path, to_path);
 
 			/* create tablespace directory from waldir_path*/
+			err = $i(pioMakeDir, drive, .path = waldir_path,
+					 .mode = pg_tablespace_mode, .strict = false);
+			if ($haserr(err))
 			{
-				err_i err;
-
-				err = $i(pioMakeDir, drive, .path = waldir_path,
-						 .mode = pg_tablespace_mode, .strict = false);
-				if ($haserr(err))
-				{
-					elog(WARNING, "%s", $errmsg(err));
-				}
+				elog(WARNING, "%s", $errmsg(err));
 			}
 
 			/* create link to linked_path */
@@ -984,15 +982,11 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
 							 linked_path, to_path);
 
 					/* create tablespace directory */
+					err = $i(pioMakeDir, drive, .path = linked_path,
+							 .mode = pg_tablespace_mode, .strict = false);
+					if ($haserr(err))
 					{
-						err_i err;
-
-						err = $i(pioMakeDir, drive, .path = linked_path,
-								 .mode = pg_tablespace_mode, .strict = false);
-						if ($haserr(err))
-						{
-							elog(WARNING, "%s", $errmsg(err));
-						}
+						elog(WARNING, "%s", $errmsg(err));
 					}
 
 					/* create link to linked_path */
@@ -1011,15 +1005,11 @@ create_data_directories(parray *dest_files, const char *data_dir, const char *ba
 		join_path_components(to_path, data_dir, dir->rel_path);
 
 		// TODO check exit code
+		err = $i(pioMakeDir, drive, .path = to_path, .mode = dir->mode,
+				 .strict = false);
+		if ($haserr(err))
 		{
-			err_i err;
-
-			err = $i(pioMakeDir, drive, .path = to_path, .mode = dir->mode,
-					 .strict = false);
-			if ($haserr(err))
-			{
-				elog(WARNING, "%s", $errmsg(err));
-			}
+			elog(WARNING, "%s", $errmsg(err));
 		}
 	}
 

src/merge.c

@@ -461,6 +461,8 @@ merge_chain(InstanceState *instanceState,
 	/* in-place merge flags */
 	bool		compression_match = false;
 	bool		program_version_match = false;
+	err_i		err = $noerr();
+
 	/* It's redundant to check block checksumms during merge */
 	skip_block_validation = true;
 
@@ -641,7 +643,6 @@ merge_chain(InstanceState *instanceState,
 		{
 			char		dirpath[MAXPGPATH];
 			char		new_container[MAXPGPATH];
-			err_i		err;
 
 			makeExternalDirPathByNum(new_container, full_external_prefix,
 									 file->external_dir_num);

src/restore.c

@@ -720,6 +720,7 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
 	size_t		total_bytes = 0;
 	char		pretty_time[20];
 	time_t		start_time, end_time;
+	err_i		err = $noerr();
 
 	/* Preparations for actual restoring */
 	time2iso(timestamp, lengthof(timestamp), dest_backup->start_time, false);
@@ -818,7 +819,6 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
 		for (i = 0; i < parray_num(external_dirs); i++)
 		{
 			char	*dirpath = parray_get(external_dirs, i);
-			err_i	err;
 
 			err = $i(pioMakeDir, dest_backup->database_location,
 					 .path = dirpath, .mode = DIR_PERMISSION, .strict = false);
@@ -844,7 +844,6 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
 		{
 			char	   *external_path;
 			char		dirpath[MAXPGPATH];
-			err_i		err;
 
 			if (parray_num(external_dirs) < file->external_dir_num - 1)
 				elog(ERROR, "Inconsistent external directory backup metadata");