Some minor fixes (#397)

* Reformat fio_*() definitions for easier grep'ping
* typo
* move check_postmaster() into src/utils/file.c (from src/util.c), rename it to local_check_postmaster() and make it static/private to src/utils/file.c

Author: kulaginm

src/data.c

@@ -1516,7 +1516,7 @@ validate_one_page(Page page, BlockNumber absolute_blkno,
 }
 
 /*
- * Valiate pages of datafile in PGDATA one by one.
+ * Validate pages of datafile in PGDATA one by one.
  *
  * returns true if the file is valid
  * also returns true if the file was not found

src/pg_probackup.h

@@ -1071,8 +1071,6 @@ extern PageState *get_checksum_map(const char *fullpath, uint32 checksum_version
 								int n_blocks, XLogRecPtr dest_stop_lsn, BlockNumber segmentno);
 extern datapagemap_t *get_lsn_map(const char *fullpath, uint32 checksum_version,
 								  int n_blocks, XLogRecPtr shift_lsn, BlockNumber segmentno);
-extern pid_t check_postmaster(const char *pgdata);
-
 extern bool validate_file_pages(pgFile *file, const char *fullpath, XLogRecPtr stop_lsn,
 							    uint32 checksum_version, uint32 backup_version, HeaderMap *hdr_map);
 

src/util.c

@@ -556,51 +556,3 @@ datapagemap_print_debug(datapagemap_t *map)
 
 	pg_free(iter);
 }
-
-/*
- * Return pid of postmaster process running in given pgdata.
- * Return 0 if there is none.
- * Return 1 if postmaster.pid is mangled.
- */
-pid_t
-check_postmaster(const char *pgdata)
-{
-	FILE  *fp;
-	pid_t  pid;
-	char   pid_file[MAXPGPATH];
-
-	join_path_components(pid_file, pgdata, "postmaster.pid");
-
-	fp = fopen(pid_file, "r");
-	if (fp == NULL)
-	{
-		/* No pid file, acceptable*/
-		if (errno == ENOENT)
-			return 0;
-		else
-			elog(ERROR, "Cannot open file \"%s\": %s",
-				pid_file, strerror(errno));
-	}
-
-	if (fscanf(fp, "%i", &pid) != 1)
-	{
-		/* something is wrong with the file content */
-		pid = 1;
-	}
-
-	if (pid > 1)
-	{
-		if (kill(pid, 0) != 0)
-		{
-			/* process no longer exists */
-			if (errno == ESRCH)
-				pid = 0;
-			else
-				elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-						pid, strerror(errno));
-		}
-	}
-
-	fclose(fp);
-	return pid;
-}