more mingw compatibility

Author: funny-falcon

src/archive.c

@@ -148,7 +148,7 @@ do_archive_push(InstanceState *instanceState, InstanceConfig *instance, char *pg
 		n_threads = parray_num(batch_files);
 
 	elog(INFO, "pg_probackup archive-push WAL file: %s, "
-					"threads: %i/%i, batch: %lu/%i, compression: %s",
+					"threads: %i/%i, batch: %zu/%i, compression: %s",
 						wal_file_name, n_threads, num_threads,
 						parray_num(batch_files), batch_size,
 						is_compress ? "zlib" : "none");

src/catalog.c

@@ -422,8 +422,8 @@ grab_excl_lock_file(const char *root_dir, const char *backup_id, bool strict)
 			/* complain every fifth interval */
 			if ((ntries % LOG_FREQ) == 0)
 			{
-				elog(WARNING, "Process %d is using backup %s, and is still running",
-					 encoded_pid, backup_id);
+				elog(WARNING, "Process %lld is using backup %s, and is still running",
+					 (long long)encoded_pid, backup_id);
 
 				elog(WARNING, "Waiting %u seconds on exclusive lock for backup %s",
 					 ntries, backup_id);
@@ -437,8 +437,8 @@ grab_excl_lock_file(const char *root_dir, const char *backup_id, bool strict)
 		else
 		{
 			if (errno == ESRCH)
-				elog(WARNING, "Process %d which used backup %s no longer exists",
-					 encoded_pid, backup_id);
+				elog(WARNING, "Process %lld which used backup %s no longer exists",
+					 (long long)encoded_pid, backup_id);
 			else
 				elog(ERROR, "Failed to send signal 0 to a process %d: %s",
 					encoded_pid, strerror(errno));
@@ -467,7 +467,7 @@ grab_excl_lock_file(const char *root_dir, const char *backup_id, bool strict)
 	/*
 	 * Successfully created the file, now fill it.
 	 */
-	snprintf(buffer, sizeof(buffer), "%d\n", my_pid);
+	snprintf(buffer, sizeof(buffer), "%lld\n", (long long)my_pid);
 
 	errno = 0;
 	if (fio_write(fd, buffer, strlen(buffer)) != strlen(buffer))
@@ -574,8 +574,8 @@ wait_shared_owners(pgBackup *backup)
                 /* complain from time to time */
                 if ((ntries % LOG_FREQ) == 0)
                 {
-                    elog(WARNING, "Process %d is using backup %s in shared mode, and is still running",
-                            encoded_pid, base36enc(backup->start_time));
+                    elog(WARNING, "Process %lld is using backup %s in shared mode, and is still running",
+                            (long long)encoded_pid, base36enc(backup->start_time));
 
                     elog(WARNING, "Waiting %u seconds on lock for backup %s", ntries,
                             base36enc(backup->start_time));
@@ -587,8 +587,8 @@ wait_shared_owners(pgBackup *backup)
                 continue;
             }
             else if (errno != ESRCH)
-                elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-                        encoded_pid, strerror(errno));
+                elog(ERROR, "Failed to send signal 0 to a process %lld: %s",
+                        (long long)encoded_pid, strerror(errno));
 
             /* locker is dead */
             break;
@@ -605,8 +605,8 @@ wait_shared_owners(pgBackup *backup)
     /* some shared owners are still alive */
     if (ntries <= 0)
     {
-        elog(WARNING, "Cannot to lock backup %s in exclusive mode, because process %u owns shared lock",
-                base36enc(backup->start_time), encoded_pid);
+        elog(WARNING, "Cannot to lock backup %s in exclusive mode, because process %llu owns shared lock",
+                base36enc(backup->start_time), (long long)encoded_pid);
         return 1;
     }
 
@@ -661,11 +661,11 @@ grab_shared_lock_file(pgBackup *backup)
 			 * Somebody is still using this backup in shared mode,
 			 * copy this pid into a new file.
 			 */
-			buffer_len += snprintf(buffer+buffer_len, 4096, "%u\n", encoded_pid);
+			buffer_len += snprintf(buffer+buffer_len, 4096, "%llu\n", (long long)encoded_pid);
 		}
 		else if (errno != ESRCH)
-			elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-					encoded_pid, strerror(errno));
+			elog(ERROR, "Failed to send signal 0 to a process %lld: %s",
+					(long long)encoded_pid, strerror(errno));
 	}
 
 	if (fp_in)
@@ -685,7 +685,7 @@ grab_shared_lock_file(pgBackup *backup)
 	}
 
 	/* add my own pid */
-	buffer_len += snprintf(buffer+buffer_len, sizeof(buffer), "%u\n", my_pid);
+	buffer_len += snprintf(buffer+buffer_len, sizeof(buffer), "%llu\n", (long long)my_pid);
 
 	/* write out the collected PIDs to temp lock file */
 	fwrite(buffer, 1, buffer_len, fp_out);
@@ -783,11 +783,11 @@ release_shared_lock_file(const char *backup_dir)
 			 * Somebody is still using this backup in shared mode,
 			 * copy this pid into a new file.
 			 */
-			buffer_len += snprintf(buffer+buffer_len, 4096, "%u\n", encoded_pid);
+			buffer_len += snprintf(buffer+buffer_len, 4096, "%llu\n", (long long)encoded_pid);
 		}
 		else if (errno != ESRCH)
-			elog(ERROR, "Failed to send signal 0 to a process %d: %s",
-					encoded_pid, strerror(errno));
+			elog(ERROR, "Failed to send signal 0 to a process %lld: %s",
+					(long long)encoded_pid, strerror(errno));
     }
 
 	if (ferror(fp_in))

src/catchup.c

@@ -137,8 +137,8 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,
 		}
 		else if (pid > 1) /* postmaster is up */
 		{
-			elog(ERROR, "Postmaster with pid %u is running in destination directory \"%s\"",
-				pid, dest_pgdata);
+			elog(ERROR, "Postmaster with pid %lld is running in destination directory \"%s\"",
+				(long long)pid, dest_pgdata);
 		}
 	}
 
@@ -160,15 +160,15 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,
 		source_id = get_system_identifier(FIO_DB_HOST, source_pgdata, false); /* same as instance_config.system_identifier */
 
 		if (source_conn_id != source_id)
-			elog(ERROR, "Database identifiers mismatch: we connected to DB id %lu, but in \"%s\" we found id %lu",
-				source_conn_id, source_pgdata, source_id);
+			elog(ERROR, "Database identifiers mismatch: we connected to DB id %llu, but in \"%s\" we found id %llu",
+				(long long)source_conn_id, source_pgdata, (long long)source_id);
 
 		if (current.backup_mode != BACKUP_MODE_FULL)
 		{
 			dest_id = get_system_identifier(FIO_LOCAL_HOST, dest_pgdata, false);
 			if (source_conn_id != dest_id)
-			elog(ERROR, "Database identifiers mismatch: we connected to DB id %lu, but in \"%s\" we found id %lu",
-				source_conn_id, dest_pgdata, dest_id);
+			elog(ERROR, "Database identifiers mismatch: we connected to DB id %llu, but in \"%s\" we found id %llu",
+				(long long)source_conn_id, dest_pgdata, (long long)dest_id);
 		}
 	}
 
@@ -439,7 +439,7 @@ catchup_thread_runner(void *arg)
 
 		if (file->write_size == BYTES_INVALID)
 		{
-			elog(LOG, "Skipping the unchanged file: \"%s\", read %li bytes", from_fullpath, file->read_size);
+			elog(LOG, "Skipping the unchanged file: \"%s\", read %zu bytes", from_fullpath, file->read_size);
 			continue;
 		}
 

src/data.c

@@ -204,12 +204,12 @@ get_header_errormsg(Page page, char **errormsg)
 
 	if (PageGetPageSize(phdr) != BLCKSZ)
 		snprintf(*errormsg, ERRMSG_MAX_LEN, "page header invalid, "
-				"page size %lu is not equal to block size %u",
+				"page size %zu is not equal to block size %u",
 				PageGetPageSize(phdr), BLCKSZ);
 
 	else if (phdr->pd_lower < SizeOfPageHeaderData)
 		snprintf(*errormsg, ERRMSG_MAX_LEN, "page header invalid, "
-				"pd_lower %i is less than page header size %lu",
+				"pd_lower %i is less than page header size %zu",
 				phdr->pd_lower, SizeOfPageHeaderData);
 
 	else if (phdr->pd_lower > phdr->pd_upper)
@@ -229,7 +229,7 @@ get_header_errormsg(Page page, char **errormsg)
 
 	else if (phdr->pd_special != MAXALIGN(phdr->pd_special))
 		snprintf(*errormsg, ERRMSG_MAX_LEN, "page header invalid, "
-				"pd_special %i is misaligned, expected %lu",
+				"pd_special %i is misaligned, expected %zu",
 				phdr->pd_special, MAXALIGN(phdr->pd_special));
 
 	else if (phdr->pd_flags & ~PD_VALID_FLAG_BITS)
@@ -1196,7 +1196,7 @@ restore_data_file_internal(FILE *in, FILE *out, pgFile *file, uint32 backup_vers
 			datapagemap_add(map, blknum);
 	}
 
-	elog(LOG, "Copied file \"%s\": %lu bytes", from_fullpath, write_len);
+	elog(LOG, "Copied file \"%s\": %zu bytes", from_fullpath, write_len);
 	return write_len;
 }
 
@@ -1240,7 +1240,7 @@ restore_non_data_file_internal(FILE *in, FILE *out, pgFile *file,
 
 	pg_free(buf);
 
-	elog(LOG, "Copied file \"%s\": %lu bytes", from_fullpath, file->write_size);
+	elog(LOG, "Copied file \"%s\": %llu bytes", from_fullpath, (long long)file->write_size);
 }
 
 size_t
@@ -1317,9 +1317,9 @@ restore_non_data_file(parray *parent_chain, pgBackup *dest_backup,
 		elog(ERROR, "Failed to locate a full copy of non-data file \"%s\"", to_fullpath);
 
 	if (tmp_file->write_size <= 0)
-		elog(ERROR, "Full copy of non-data file has invalid size: %li. "
+		elog(ERROR, "Full copy of non-data file has invalid size: %lli. "
 				"Metadata corruption in backup %s in file: \"%s\"",
-				tmp_file->write_size, base36enc(tmp_backup->start_time),
+				(long long)tmp_file->write_size, base36enc(tmp_backup->start_time),
 				to_fullpath);
 
 	/* incremental restore */
@@ -2031,11 +2031,11 @@ get_page_header(FILE *in, const char *fullpath, BackupPageHeader* bph,
 			return false;		/* EOF found */
 		else if (read_len != 0 && feof(in))
 			elog(ERROR,
-				 "Odd size page found at offset %ld of \"%s\"",
-				 ftello(in), fullpath);
+				 "Odd size page found at offset %lld of \"%s\"",
+				 (long long)ftello(in), fullpath);
 		else
-			elog(ERROR, "Cannot read header at offset %ld of \"%s\": %s",
-				 ftello(in), fullpath, strerror(errno));
+			elog(ERROR, "Cannot read header at offset %lld of \"%s\": %s",
+				 (long long)ftello(in), fullpath, strerror(errno));
 	}
 
 	/* In older versions < 2.4.0, when crc for file was calculated, header was
@@ -2335,8 +2335,8 @@ copy_pages(const char *to_fullpath, const char *from_fullpath,
 					 to_fullpath, strerror(errno));
 
 			if (ftruncate(fileno(out), file->size) == -1)
-				elog(ERROR, "Cannot ftruncate file \"%s\" to size %lu: %s",
-					 to_fullpath, file->size, strerror(errno));
+				elog(ERROR, "Cannot ftruncate file \"%s\" to size %llu: %s",
+					 to_fullpath, (long long)file->size, strerror(errno));
 		}
 	}
 
@@ -2443,7 +2443,7 @@ get_data_file_headers(HeaderMap *hdr_map, pgFile *file, uint32 backup_version, b
 	if (hdr_crc != file->hdr_crc)
 	{
 		elog(strict ? ERROR : WARNING, "Header map for file \"%s\" crc mismatch \"%s\" "
-				"offset: %llu, len: %lu, current: %u, expected: %u",
+				"offset: %llu, len: %zu, current: %u, expected: %u",
 			file->rel_path, hdr_map->path, file->hdr_off, read_len, hdr_crc, file->hdr_crc);
 		goto cleanup;
 	}

src/merge.c

@@ -957,7 +957,7 @@ merge_files(void *arg)
 		if (S_ISDIR(dest_file->mode))
 			goto done;
 
-		elog(progress ? INFO : LOG, "Progress: (%d/%lu). Merging file \"%s\"",
+		elog(progress ? INFO : LOG, "Progress: (%d/%zu). Merging file \"%s\"",
 			i + 1, n_files, dest_file->rel_path);
 
 		if (dest_file->is_datafile && !dest_file->is_cfs)

src/restore.c

@@ -1104,14 +1104,14 @@ static void *
 restore_files(void *arg)
 {
 	int         i;
-	uint64      n_files;
+	size_t      n_files;
 	char        to_fullpath[MAXPGPATH];
 	FILE       *out = NULL;
 	char       *out_buf = pgut_malloc(STDIO_BUFSIZE);
 
 	restore_files_arg *arguments = (restore_files_arg *) arg;
 
-	n_files = (unsigned long) parray_num(arguments->dest_files);
+	n_files = parray_num(arguments->dest_files);
 
 	for (i = 0; i < parray_num(arguments->dest_files); i++)
 	{
@@ -1132,7 +1132,7 @@ restore_files(void *arg)
 		if (interrupted || thread_interrupted)
 			elog(ERROR, "Interrupted during restore");
 
-		elog(progress ? INFO : LOG, "Progress: (%d/%lu). Restore file \"%s\"",
+		elog(progress ? INFO : LOG, "Progress: (%d/%zu). Restore file \"%s\"",
 			 i + 1, n_files, dest_file->rel_path);
 
 		/* Only files from pgdata can be skipped by partial restore */
@@ -2173,8 +2173,8 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 	}
 	else if (pid > 1) /* postmaster is up */
 	{
-		elog(WARNING, "Postmaster with pid %u is running in destination directory \"%s\"",
-			pid, pgdata);
+		elog(WARNING, "Postmaster with pid %llu is running in destination directory \"%s\"",
+			(long long)pid, pgdata);
 		success = false;
 		postmaster_is_up = true;
 	}
@@ -2197,9 +2197,9 @@ check_incremental_compatibility(const char *pgdata, uint64 system_identifier,
 	if (system_id_pgdata == instance_config.system_identifier)
 		system_id_match = true;
 	else
-		elog(WARNING, "Backup catalog was initialized for system id %lu, "
-					"but destination directory system id is %lu",
-					system_identifier, system_id_pgdata);
+		elog(WARNING, "Backup catalog was initialized for system id %llu, "
+					"but destination directory system id is %llu",
+					(long long)system_identifier, (long long)system_id_pgdata);
 
 	/*
 	 * TODO: maybe there should be some other signs, pointing to pg_control

src/show.c

@@ -910,7 +910,7 @@ show_archive_plain(const char *instance_name, uint32 xlog_seg_size,
 		cur++;
 
 		/* N files */
-		snprintf(row->n_segments, lengthof(row->n_segments), "%lu",
+		snprintf(row->n_segments, lengthof(row->n_segments), "%zu",
 				 tlinfo->n_xlog_files);
 		widths[cur] = Max(widths[cur], strlen(row->n_segments));
 		cur++;
@@ -930,7 +930,7 @@ show_archive_plain(const char *instance_name, uint32 xlog_seg_size,
 		cur++;
 
 		/* N backups */
-		snprintf(row->n_backups, lengthof(row->n_backups), "%lu",
+		snprintf(row->n_backups, lengthof(row->n_backups), "%zu",
 				 tlinfo->backups?parray_num(tlinfo->backups):0);
 		widths[cur] = Max(widths[cur], strlen(row->n_backups));
 		cur++;
@@ -1086,10 +1086,10 @@ show_archive_json(const char *instance_name, uint32 xlog_seg_size,
 		json_add_value(buf, "max-segno", tmp_buf, json_level, true);
 
 		json_add_key(buf, "n-segments", json_level);
-		appendPQExpBuffer(buf, "%lu", tlinfo->n_xlog_files);
+		appendPQExpBuffer(buf, "%zu", tlinfo->n_xlog_files);
 
 		json_add_key(buf, "size", json_level);
-		appendPQExpBuffer(buf, "%lu", tlinfo->size);
+		appendPQExpBuffer(buf, "%zu", tlinfo->size);
 
 		json_add_key(buf, "zratio", json_level);