Minor style fixes

Author: za-arthur

src/backup.c

@@ -105,7 +105,7 @@ static void write_backup_file_list(parray *files, const char *root);
 static void wait_wal_lsn(XLogRecPtr lsn, bool wait_prev_segment);
 static void wait_replica_wal_lsn(XLogRecPtr lsn, bool is_start_backup);
 static void make_pagemap_from_ptrack(parray *files);
-static void StreamLog(void *arg);
+static void *StreamLog(void *arg);
 
 static void get_remote_pgdata_filelist(parray *files);
 static void ReceiveFileList(parray* files, PGconn *conn, PGresult *res, int rownum);
@@ -599,8 +599,7 @@ do_backup_instance(void)
 		/* By default there are some error */
 		stream_thread_arg.ret = 1;
 
-		pthread_create(&stream_thread, NULL, (void *(*)(void *)) StreamLog,
-					   &stream_thread_arg);
+		pthread_create(&stream_thread, NULL, StreamLog, &stream_thread_arg);
 	}
 
 	/* initialize backup list */
@@ -1051,8 +1050,7 @@ confirm_block_size(const char *name, int blcksz)
 			 "%s(%d) is not compatible(%d expected)",
 			 name, block_size, blcksz);
 
-	PQclear(res);//bad pointer to endp
-
+	PQclear(res);
 }
 
 /*
@@ -2539,7 +2537,7 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
 /*
  * Start the log streaming
  */
-static void
+static void *
 StreamLog(void *arg)
 {
 	XLogRecPtr	startpos;
@@ -2613,6 +2611,8 @@ StreamLog(void *arg)
 
 	PQfinish(stream_arg->conn);
 	stream_arg->conn = NULL;
+
+	return NULL;
 }
 
 /*

src/configure.c

@@ -132,8 +132,7 @@ writeBackupCatalogConfig(FILE *out, pgBackupConfig *config)
 
 	fprintf(out, "#Backup instance info\n");
 	fprintf(out, "PGDATA = %s\n", config->pgdata);
-	//fprintf(out, "system-identifier = %li\n", config->system_identifier);
-	fprintf(out, "system-identifier = %" INT64_MODIFIER "u\n", config->system_identifier);
+	fprintf(out, "system-identifier = " UINT64_FORMAT "\n", config->system_identifier);
 
 	fprintf(out, "#Connection parameters:\n");
 	if (config->pgdatabase)

src/dir.c

@@ -100,12 +100,9 @@ static void dir_list_file_internal(parray *files, const char *root,
 int
 dir_create_dir(const char *dir, mode_t mode)
 {
-	char		copy[MAXPGPATH];
-	char		*parent;
+	char		parent[MAXPGPATH];
 
-	strncpy(copy, dir, MAXPGPATH);
-
-	parent = pstrdup(dir);
+	strncpy(parent, dir, MAXPGPATH);
 	get_parent_directory(parent);
 
 	/* Create parent first */
@@ -120,7 +117,6 @@ dir_create_dir(const char *dir, mode_t mode)
 		elog(ERROR, "cannot create directory \"%s\": %s", dir, strerror(errno));
 	}
 
-	pfree(parent);
 	return 0;
 }
 
@@ -155,7 +151,7 @@ pgFileInit(const char *path)
 
 	file = (pgFile *) pgut_malloc(sizeof(pgFile));
 
-	file->name = 0;
+	file->name = NULL;
 
 	file->size = 0;
 	file->mode = 0;

src/restore.c

@@ -92,7 +92,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 	int			dest_backup_index = 0;
 	int			base_full_backup_index = 0;
 	int			corrupted_backup_index = 0;
-	char 	   *action = is_restore ? "Restore":"Validate";
+	char	   *action = is_restore ? "Restore":"Validate";
 
 	if (is_restore)
 	{

src/utils/logger.c

@@ -562,7 +562,7 @@ open_logfile(FILE **file, const char *filename_format)
 			{
 				char		buf[1024];
 
-				control_file = fopen(control, PG_BINARY_R);
+				control_file = fopen(control, "r");
 				if (control_file == NULL)
 					elog_stderr(ERROR, "cannot open rotation file \"%s\": %s",
 								control, strerror(errno));
@@ -608,7 +608,7 @@ open_logfile(FILE **file, const char *filename_format)
 	{
 		time_t		timestamp = time(NULL);
 
-		control_file = fopen(control, PG_BINARY_W);
+		control_file = fopen(control, "w");
 		if (control_file == NULL)
 			elog_stderr(ERROR, "cannot open rotation file \"%s\": %s",
 						control, strerror(errno));

src/utils/pgut.c

@@ -989,7 +989,7 @@ longopts_to_optstring(const struct option opts[], const size_t len)
 	s = result;
 	for (i = 0; i < len; i++)
 	{
-		if (!isprint(opts[i].val)) //opts[i].val > 128 ||
+		if (!isprint(opts[i].val))
 			continue;
 		*s++ = opts[i].val;
 		if (opts[i].has_arg != no_argument)
@@ -1046,7 +1046,6 @@ pgut_getopt(int argc, char **argv, pgut_option options[])
 	struct option *longopts;
 	size_t		len;
 
-
 	len = option_length(options);
 	longopts = pgut_newarray(struct option, len + 1);
 	option_copy(longopts, options, len);
@@ -1221,7 +1220,7 @@ get_next_token(const char *src, char *dst, const char *line)
 	}
 	else
 	{
-		i = j = strcspn(s, "#\n\r\t\v");//removed space 
+		i = j = strcspn(s, "#\n\r\t\v");
 		memcpy(dst, s, j);
 	}