[brasero: 1/6] 2009-04-19 Philippe Rouquier <bonfire-app wanadoo fr>

[Philippe Rouquier <philippr src gnome org>]

commit 10bbc0beba702de962795909ad0d638601360dc5
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Apr 19 14:41:24 2009 +0200

    2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	Fix some warnings with 64 bits arch
    
    	* libbrasero-burn/burn-job.c (brasero_job_check_output_disc_space):
    	* libbrasero-media/brasero-units.c (brasero_units_get_time_string):
    	* plugins/cdrkit/burn-readom.c
    	(brasero_readom_argv_set_iso_boundary):
    	* plugins/cdrkit/burn-wodim.c (brasero_wodim_set_argv_record),
    	(brasero_wodim_set_argv_blank):
    	* plugins/cdrtools/burn-cdrecord.c
    	(brasero_cdrecord_set_argv_record):
    	* plugins/cdrtools/burn-readcd.c
    	(brasero_readcd_argv_set_iso_boundary):
---
 ChangeLog                        |   15 +++++++++++++++
 libbrasero-burn/burn-job.c       |    4 ++--
 libbrasero-media/brasero-units.c |   16 ++++++++--------
 plugins/cdrkit/burn-readom.c     |   10 +++++-----
 plugins/cdrkit/burn-wodim.c      |    4 ++--
 plugins/cdrtools/burn-cdrecord.c |    2 +-
 plugins/cdrtools/burn-readcd.c   |   14 +++++++-------
 7 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 679fb9d..8e23687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
+
+	Fix some warnings with 64 bits arch
+
+	* libbrasero-burn/burn-job.c (brasero_job_check_output_disc_space):
+	* libbrasero-media/brasero-units.c (brasero_units_get_time_string):
+	* plugins/cdrkit/burn-readom.c
+	(brasero_readom_argv_set_iso_boundary):
+	* plugins/cdrkit/burn-wodim.c (brasero_wodim_set_argv_record),
+	(brasero_wodim_set_argv_blank):
+	* plugins/cdrtools/burn-cdrecord.c
+	(brasero_cdrecord_set_argv_record):
+	* plugins/cdrtools/burn-readcd.c
+	(brasero_readcd_argv_set_iso_boundary):
+
 2009-04-18  Philippe Rouquier  <bonfire-app wanadoo fr>
 
 	Added some more decent flags for nautilus extension
diff --git a/libbrasero-burn/burn-job.c b/libbrasero-burn/burn-job.c
index 4d58aaa..67323e5 100644
--- a/libbrasero-burn/burn-job.c
+++ b/libbrasero-burn/burn-job.c
@@ -411,13 +411,13 @@ brasero_job_check_output_disc_space (BraseroJob *self,
 	/* This is not really an error, we'll probably ask the 
 	 * user to load a new disc */
 	if (output_blocks > media_blocks) {
-		BRASERO_BURN_LOG ("Insufficient space on disc %lli/%lli",
+		BRASERO_BURN_LOG ("Insufficient space on disc %"G_GINT64_FORMAT"/%"G_GINT64_FORMAT,
 				  media_blocks,
 				  output_blocks);
 		g_set_error (error,
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_MEDIUM_SPACE,
-			     _("Not enough space available on the disc (%lli available for %lli)"),
+			     _("Not enough space available on the disc (%"G_GINT64_FORMAT" available for %"G_GINT64_FORMAT")"),
 			     media_blocks,
 			     output_blocks);
 		return BRASERO_BURN_NEED_RELOAD;
diff --git a/libbrasero-media/brasero-units.c b/libbrasero-media/brasero-units.c
index 86baddc..1cbdea8 100644
--- a/libbrasero-media/brasero-units.c
+++ b/libbrasero-media/brasero-units.c
@@ -62,39 +62,39 @@ brasero_units_get_time_string (guint64 time,
 		if (with_unit) {
 			if (hour && minute && second)
 				/* FIXME: mark these strings for translation? */
-				return g_strdup_printf ("%lli h %02lli min %02lli",
+				return g_strdup_printf ("%"G_GINT64_FORMAT" h %02"G_GINT64_FORMAT" min %02"G_GINT64_FORMAT,
 							 hour,
 							 minute,
 							 second);
 			else if (hour && minute)
-				return g_strdup_printf ("%lli h %02lli",
+				return g_strdup_printf ("%" G_GINT64_FORMAT " h %02"G_GINT64_FORMAT,
 							 hour,
 							 minute);
 			else
-				return g_strdup_printf ("%lli h",hour);
+				return g_strdup_printf ("%"G_GINT64_FORMAT " h", hour);
 		}
 		else if (hour && minute && second)
-			return g_strdup_printf ("%lli:%02lli:%02lli",
+			return g_strdup_printf ("%"G_GINT64_FORMAT":%02"G_GINT64_FORMAT":%02"G_GINT64_FORMAT,
 						 hour,
 						 minute,
 						 second);
 		else if (hour && minute)
-			return g_strdup_printf ("%lli:%02lli", hour, minute);
+			return g_strdup_printf ("%"G_GINT64_FORMAT":%02"G_GINT64_FORMAT, hour, minute);
 	}
 
 	if (with_unit) {
 		if (!second)
 			/* Translators: %lli is a duration expressed in minutes
 			 * hence the "min" as unit. */
-			return g_strdup_printf (_("%lli min"), minute);
+			return g_strdup_printf (_("%"G_GINT64_FORMAT" min"), minute);
 		else
 			/* Translators: the first %lli is the number of minutes
 			 * and the second one is the number of seconds.
 			 * The whole string expresses a duration */
-			return g_strdup_printf (_("%lli:%02lli min"), minute, second);
+			return g_strdup_printf (_("%"G_GINT64_FORMAT":%02"G_GINT64_FORMAT" min"), minute, second);
 	}
 	else
-		return g_strdup_printf ("%lli:%02lli", minute, second);
+		return g_strdup_printf ("%"G_GINT64_FORMAT":%02"G_GINT64_FORMAT, minute, second);
 }
 
 
diff --git a/plugins/cdrkit/burn-readom.c b/plugins/cdrkit/burn-readom.c
index 60677e8..f7c7ce9 100644
--- a/plugins/cdrkit/burn-readom.c
+++ b/plugins/cdrkit/burn-readom.c
@@ -156,7 +156,7 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
 				 "reading from sector %lli to %lli",
 				 start,
 				 end);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%lli-%lli",
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
 							start,
 							end));
 	}
@@ -182,7 +182,7 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
 				 brasero_track_disc_get_track_num (BRASERO_TRACK_DISC (track)),
 				 start,
 				 start + nb_blocks);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%lli-%lli",
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
 							start,
 							start + nb_blocks));
 	}
@@ -201,16 +201,16 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
 							    NULL,
 							    &start);
 		BRASERO_JOB_LOG (readom,
-				 "reading last track from sector %lli to %lli",
+				 "reading last track from sector %"G_GINT64_FORMAT" to %"G_GINT64_FORMAT,
 				 start,
 				 start + nb_blocks);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%lli-%lli",
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
 							start,
 							start + nb_blocks));
 	}
 	else {
 		brasero_track_get_size (track, &nb_blocks, NULL);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=0-%lli", nb_blocks));
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=0-%"G_GINT64_FORMAT, nb_blocks));
 	}
 
 	brasero_track_type_free (output);
diff --git a/plugins/cdrkit/burn-wodim.c b/plugins/cdrkit/burn-wodim.c
index 3f0086f..6b63471 100644
--- a/plugins/cdrkit/burn-wodim.c
+++ b/plugins/cdrkit/burn-wodim.c
@@ -813,7 +813,7 @@ brasero_wodim_set_argv_record (BraseroWodim *wodim,
 		g_ptr_array_add (argv, g_strdup_printf ("fs=%im", buffer_size));
 		if (brasero_track_type_get_has_image (type)) {
 			if (brasero_track_type_get_image_format (type) == BRASERO_IMAGE_FORMAT_BIN) {
-				g_ptr_array_add (argv, g_strdup_printf ("tsize=%Lis", sectors));
+				g_ptr_array_add (argv, g_strdup_printf ("tsize=%"G_GINT64_FORMAT"s", sectors));
 
 				g_ptr_array_add (argv, g_strdup ("-data"));
 				g_ptr_array_add (argv, g_strdup ("-nopad"));
@@ -1026,7 +1026,7 @@ brasero_wodim_set_argv_blank (BraseroWodim *wodim, GPtrArray *argv)
 			if (!sectors)
 				brasero_medium_get_capacity (medium, NULL, &sectors);
 
-			g_ptr_array_add (argv, g_strdup_printf ("tsize=%Lis", sectors));
+			g_ptr_array_add (argv, g_strdup_printf ("tsize=%"G_GINT64_FORMAT"s", sectors));
 		}
 		else	/* we set 512s because wodim complains otherwise */
 			g_ptr_array_add (argv, g_strdup_printf ("tsize=512s"));
diff --git a/plugins/cdrtools/burn-cdrecord.c b/plugins/cdrtools/burn-cdrecord.c
index 0af98d4..d8b599a 100644
--- a/plugins/cdrtools/burn-cdrecord.c
+++ b/plugins/cdrtools/burn-cdrecord.c
@@ -800,7 +800,7 @@ brasero_cdrecord_set_argv_record (BraseroCDRecord *cdrecord,
 
 			format = brasero_track_type_get_image_format (type);
 			if (format == BRASERO_IMAGE_FORMAT_BIN) {
-				g_ptr_array_add (argv, g_strdup_printf ("tsize=%Lis", sectors));
+				g_ptr_array_add (argv, g_strdup_printf ("tsize=%"G_GINT64_FORMAT"s", sectors));
 				g_ptr_array_add (argv, g_strdup ("-data"));
 				g_ptr_array_add (argv, g_strdup ("-nopad"));
 				g_ptr_array_add (argv, g_strdup ("-"));
diff --git a/plugins/cdrtools/burn-readcd.c b/plugins/cdrtools/burn-readcd.c
index 072d60c..5f21e97 100644
--- a/plugins/cdrtools/burn-readcd.c
+++ b/plugins/cdrtools/burn-readcd.c
@@ -155,10 +155,10 @@ brasero_readcd_argv_set_iso_boundary (BraseroReadcd *readcd,
 		end = g_value_get_uint64 (value);
 
 		BRASERO_JOB_LOG (readcd,
-				 "reading from sector %lli to %lli",
+				 "reading from sector %"G_GINT64_FORMAT" to %"G_GINT64_FORMAT,
 				 start,
 				 end);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%lli-%lli",
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
 							start,
 							end));
 	}
@@ -180,11 +180,11 @@ brasero_readcd_argv_set_iso_boundary (BraseroReadcd *readcd,
 						  &start);
 
 		BRASERO_JOB_LOG (readcd,
-				 "reading %i from sector %lli to %lli",
+				 "reading %i from sector %"G_GINT64_FORMAT" to %"G_GINT64_FORMAT,
 				 brasero_track_disc_get_track_num (BRASERO_TRACK_DISC (track)),
 				 start,
 				 start + nb_blocks);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%lli-%lli",
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
 							start,
 							start + nb_blocks));
 	}
@@ -203,16 +203,16 @@ brasero_readcd_argv_set_iso_boundary (BraseroReadcd *readcd,
 							    NULL,
 							    &start);
 		BRASERO_JOB_LOG (readcd,
-				 "reading last track from sector %lli to %lli",
+				 "reading last track from sector %"G_GINT64_FORMAT" to %"G_GINT64_FORMAT,
 				 start,
 				 start + nb_blocks);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%lli-%lli",
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
 							start,
 							start + nb_blocks));
 	}
 	else {
 		brasero_track_get_size (track, &nb_blocks, NULL);
-		g_ptr_array_add (argv, g_strdup_printf ("-sectors=0-%lli", nb_blocks));
+		g_ptr_array_add (argv, g_strdup_printf ("-sectors=0-%"G_GINT64_FORMAT, nb_blocks));
 	}
 
 	brasero_track_type_free (output);