PGPRO-1646: Use int for write_size instead of size_t

Author: za-arthur

src/backup.c

@@ -357,7 +357,7 @@ remote_copy_file(PGconn *conn, pgFile* file)
 		elog(ERROR, "final receive failed: status %d ; %s",PQresultStatus(res), PQerrorMessage(conn));
 	}
 
-	file->write_size = file->read_size;
+	file->write_size = (int) file->read_size;
 	FIN_CRC32C(file->crc);
 
 	fclose(out);
@@ -438,8 +438,8 @@ remote_backup_files(void *arg)
 		/* receive the data from stream and write to backup file */
 		remote_copy_file(file_backup_conn, file);
 
-		elog(VERBOSE, "File \"%s\". Copied %lu bytes",
-				 file->path, (unsigned long) file->write_size);
+		elog(VERBOSE, "File \"%s\". Copied %d bytes",
+			 file->path, file->write_size);
 		PQfinish(file_backup_conn);
 	}
 
@@ -2099,27 +2099,24 @@ backup_files(void *arg)
 					continue;
 				}
 			}
-			else
-				/* TODO:
-				 * Check if file exists in previous backup
-				 * If exists:
-				 *   if mtime > start_backup_time of parent backup,
-				 *    copy file to backup
-				 *   if mtime < start_backup_time
-				 *    calculate crc, compare crc to old file
-				 *      if crc is the same -> skip file
-				 */
-				if (!copy_file(arguments->from_root,
-							   arguments->to_root,
-							   file))
+			/* TODO:
+			 * Check if file exists in previous backup
+			 * If exists:
+			 *   if mtime > start_backup_time of parent backup,
+			 *    copy file to backup
+			 *   if mtime < start_backup_time
+			 *    calculate crc, compare crc to old file
+			 *      if crc is the same -> skip file
+			 */
+			else if (!copy_file(arguments->from_root, arguments->to_root, file))
 			{
 				file->write_size = BYTES_INVALID;
 				elog(VERBOSE, "File \"%s\" was not copied to backup", file->path);
 				continue;
 			}
 
-			elog(VERBOSE, "File \"%s\". Copied %lu bytes",
-				 file->path, (unsigned long) file->write_size);
+			elog(VERBOSE, "File \"%s\". Copied %d bytes",
+				 file->path, file->write_size);
 		}
 		else
 			elog(LOG, "unexpected file type %d", buf.st_mode);

src/data.c

@@ -229,8 +229,8 @@ backup_data_page(backup_files_args *arguments,
 				 BackupMode backup_mode)
 {
 	BackupPageHeader	header;
-	Page 				page = malloc(BLCKSZ);
-	Page 				compressed_page = NULL;
+	Page				page = malloc(BLCKSZ);
+	Page				compressed_page = NULL;
 	XLogRecPtr			page_lsn = 0;
 	size_t				write_buffer_size;
 	char				write_buffer[BLCKSZ+sizeof(header)];
@@ -385,7 +385,7 @@ backup_data_page(backup_files_args *arguments,
 	/* write data page */
 	if(fwrite(write_buffer, 1, write_buffer_size, out) != write_buffer_size)
 	{
-		int errno_tmp = errno;
+		int			errno_tmp = errno;
 		fclose(in);
 		fclose(out);
 		elog(ERROR, "File: %s, cannot write backup at block %u : %s",
@@ -843,7 +843,7 @@ copy_file(const char *from_root, const char *to_root, pgFile *file)
 		file->read_size += read_len;
 	}
 
-	file->write_size = file->read_size;
+	file->write_size = (int) file->read_size;
 	/* finish CRC calculation and store into pgFile */
 	FIN_CRC32C(crc);
 	file->crc = crc;

src/dir.c

@@ -821,11 +821,11 @@ print_file_list(FILE *out, const parray *files, const char *root)
 		if (root && strstr(path, root) == path)
 			path = GetRelativePath(path, root);
 
-		fprintf(out, "{\"path\":\"%s\", \"size\":\"%lu\",\"mode\":\"%u\","
+		fprintf(out, "{\"path\":\"%s\", \"size\":\"%d\",\"mode\":\"%u\","
 					 "\"is_datafile\":\"%u\", \"is_cfs\":\"%u\", \"crc\":\"%u\","
 					 "\"compress_alg\":\"%s\"",
-				path, (unsigned long) file->write_size, file->mode,
-				file->is_datafile?1:0, file->is_cfs?1:0, file->crc,
+				path, file->write_size, file->mode,
+				file->is_datafile ? 1 : 0, file->is_cfs ? 1 : 0, file->crc,
 				deparse_compress_alg(file->compress_alg));
 
 		if (file->is_datafile)
@@ -1032,7 +1032,7 @@ dir_read_file_list(const char *root, const char *file_txt)
 
 		file = pgFileInit(filepath);
 
-		file->write_size = (size_t) write_size;
+		file->write_size = (int) write_size;
 		file->mode = (mode_t) mode;
 		file->is_datafile = is_datafile ? true : false;
 		file->is_cfs = is_cfs ? true : false;

src/pg_probackup.h

@@ -88,7 +88,7 @@ typedef struct pgFile
 	size_t	size;			/* size of the file */
 	size_t	read_size;		/* size of the portion read (if only some pages are
 							   backed up, it's different from size) */
-	size_t	write_size;		/* size of the backed-up file. BYTES_INVALID means
+	int		write_size;		/* size of the backed-up file. BYTES_INVALID means
 							   that the file existed but was not backed up
 							   because not modified since last backup. */
 	pg_crc32 crc;			/* CRC value of the file, regular file only */
@@ -160,7 +160,7 @@ typedef enum ShowFormat
 
 
 /* special values of pgBackup fields */
-#define INVALID_BACKUP_ID	 0    /* backup ID is not provided by user */
+#define INVALID_BACKUP_ID	0    /* backup ID is not provided by user */
 #define BYTES_INVALID		(-1)
 
 typedef struct pgBackupConfig

src/restore.c

@@ -777,8 +777,8 @@ restore_files(void *arg)
 
 		/* print size of restored file */
 		if (file->write_size != BYTES_INVALID)
-			elog(LOG, "Restored file %s : %lu bytes",
-				file->path, (unsigned long) file->write_size);
+			elog(LOG, "Restored file %s : %d bytes",
+				 file->path, file->write_size);
 	}
 
 	/* Data files restoring is successful */

src/validate.c

@@ -189,9 +189,8 @@ pgBackupValidateFiles(void *arg)
 
 		if (file->write_size != st.st_size)
 		{
-			elog(WARNING, "Invalid size of backup file \"%s\" : %lu. Expected %lu",
-				 file->path, (unsigned long) file->write_size,
-				 (unsigned long) st.st_size);
+			elog(WARNING, "Invalid size of backup file \"%s\" : %d. Expected %lu",
+				 file->path, file->write_size, (unsigned long) st.st_size);
 			arguments->corrupted = true;
 			break;
 		}