Make changes for C89

Arthur Zakirov · Arthur Zakirov · commit 1746b549780b · 2019-04-04T20:26:36.000+03:00
diff --git a/src/catalog.c b/src/catalog.c
@@ -476,7 +476,7 @@ pgBackupCreateDir(pgBackup *backup)
 		parray *external_list;
 
 		external_list = make_external_directory_list(backup->external_dir_str);
-		for (int i = 0; i < parray_num(external_list); i++)
+		for (i = 0; i < parray_num(external_list); i++)
 		{
 			char		temp[MAXPGPATH];
 			/* Numeration of externaldirs starts with 1 */
diff --git a/src/merge.c b/src/merge.c
@@ -673,10 +673,12 @@ merge_files(void *arg)
 static void
 remove_dir_with_files(const char *path)
 {
-	parray *files = parray_new();
+	parray	   *files = parray_new();
+	int			i;
+
 	dir_list_file(files, path, true, true, true, 0);
 	parray_qsort(files, pgFileComparePathDesc);
-	for (int i = 0; i < parray_num(files); i++)
+	for (i = 0; i < parray_num(files); i++)
 	{
 		pgFile	   *file = (pgFile *) parray_get(files, i);
 
@@ -689,9 +691,11 @@ remove_dir_with_files(const char *path)
 static int
 get_external_index(const char *key, const parray *list)
 {
+	int			i;
+
 	if (!list) /* Nowhere to search */
 		return -1;
-	for (int i = 0; i < parray_num(list); i++)
+	for (i = 0; i < parray_num(list); i++)
 	{
 		if (strcmp(key, parray_get(list, i)) == 0)
 			return i + 1;
@@ -704,11 +708,12 @@ static void
 reorder_external_dirs(pgBackup *to_backup, parray *to_external,
 					  parray *from_external)
 {
-	char externaldir_template[MAXPGPATH];
+	char		externaldir_template[MAXPGPATH];
+	int			i;
 
 	pgBackupGetPath(to_backup, externaldir_template,
 					lengthof(externaldir_template), EXTERNAL_DIR);
-	for (int i = 0; i < parray_num(to_external); i++)
+	for (i = 0; i < parray_num(to_external); i++)
 	{
 		int from_num = get_external_index(parray_get(to_external, i),
 										  from_external);

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ pgBackupCreateDir(pgBackup *backup)`
`476`	`476`	`parray *external_list;`
`477`	`477`
`478`	`478`	`external_list = make_external_directory_list(backup->external_dir_str);`
`479`		`- for (int i = 0; i < parray_num(external_list); i++)`
	`479`	`+ for (i = 0; i < parray_num(external_list); i++)`
`480`	`480`	`{`
`481`	`481`	`char temp[MAXPGPATH];`
`482`	`482`	`/* Numeration of externaldirs starts with 1 */`