[brasero/wip/lantw/fix-build-with-modern-compilers: 3/3] build: Fix format string error for gcc 5
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero/wip/lantw/fix-build-with-modern-compilers: 3/3] build: Fix format string error for gcc 5
- Date: Sat, 22 Sep 2018 03:13:21 +0000 (UTC)
commit e13b40c6c2e79c279dd0fd49369ac02acd4b0f36
Author: Ting-Wei Lan <lantw src gnome org>
Date: Mon Jun 29 00:36:51 2015 +0800
build: Fix format string error for gcc 5
https://bugzilla.gnome.org/show_bug.cgi?id=747226
libbrasero-burn/brasero-burn.c | 6 +++---
libbrasero-burn/brasero-session-cfg.c | 4 ++--
libbrasero-burn/brasero-session.c | 2 +-
libbrasero-burn/brasero-xfer.c | 4 ++--
libbrasero-burn/burn-job.c | 2 +-
libbrasero-burn/burn-process.c | 2 +-
libbrasero-burn/burn-task-ctx.c | 2 +-
libbrasero-burn/burn-task.c | 2 +-
libbrasero-media/brasero-medium.c | 24 ++++++++++++------------
libbrasero-media/brasero-units.h | 4 ++--
libbrasero-media/burn-volume-source.c | 6 +++---
libbrasero-media/scsi-get-configuration.c | 2 +-
libbrasero-media/scsi-read-track-information.c | 2 +-
libbrasero-utils/brasero-metadata.c | 4 ++--
plugins/cdrkit/burn-readom.c | 4 ++--
plugins/cdrkit/burn-wodim.c | 2 +-
plugins/cdrtools/burn-cdrecord.c | 2 +-
plugins/checksum/burn-checksum-image.c | 2 +-
plugins/dvdcss/burn-dvdcss.c | 2 +-
plugins/transcode/burn-transcode.c | 10 +++++-----
20 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/libbrasero-burn/brasero-burn.c b/libbrasero-burn/brasero-burn.c
index dc4d198a..73eea95d 100644
--- a/libbrasero-burn/brasero-burn.c
+++ b/libbrasero-burn/brasero-burn.c
@@ -2221,7 +2221,7 @@ brasero_burn_run_tasks (BraseroBurn *burn,
priv->session_end = priv->session_start + len;
- BRASERO_BURN_LOG ("Burning from %lld to %lld",
+ BRASERO_BURN_LOG ("Burning from %" G_GUINT64_FORMAT " to %" G_GUINT64_FORMAT,
priv->session_start,
priv->session_end);
@@ -2502,7 +2502,7 @@ brasero_burn_record_session (BraseroBurn *burn,
value = g_new0 (GValue, 1);
g_value_init (value, G_TYPE_UINT64);
- BRASERO_BURN_LOG ("Start of last written track address == %lli", priv->session_start);
+ BRASERO_BURN_LOG ("Start of last written track address == %" G_GUINT64_FORMAT,
priv->session_start);
g_value_set_uint64 (value, priv->session_start);
brasero_track_tag_add (track,
BRASERO_TRACK_MEDIUM_ADDRESS_START_TAG,
@@ -2511,7 +2511,7 @@ brasero_burn_record_session (BraseroBurn *burn,
value = g_new0 (GValue, 1);
g_value_init (value, G_TYPE_UINT64);
- BRASERO_BURN_LOG ("End of last written track address == %lli", priv->session_end);
+ BRASERO_BURN_LOG ("End of last written track address == %" G_GUINT64_FORMAT,
priv->session_end);
g_value_set_uint64 (value, priv->session_end);
brasero_track_tag_add (track,
BRASERO_TRACK_MEDIUM_ADDRESS_END_TAG,
diff --git a/libbrasero-burn/brasero-session-cfg.c b/libbrasero-burn/brasero-session-cfg.c
index 5ab8835a..6000ee4e 100644
--- a/libbrasero-burn/brasero-session-cfg.c
+++ b/libbrasero-burn/brasero-session-cfg.c
@@ -783,7 +783,7 @@ brasero_session_cfg_check_volume_size (BraseroSessionCfg *self)
g_object_unref (info);
}
- BRASERO_BURN_LOG ("Session size %lli/Hard drive size %lli",
+ BRASERO_BURN_LOG ("Session size %" G_GOFFSET_FORMAT "/Hard drive size %" G_GOFFSET_FORMAT,
priv->session_size,
priv->disc_size);
@@ -866,7 +866,7 @@ brasero_session_cfg_check_size (BraseroSessionCfg *self)
priv->disc_size = 0;
}
- BRASERO_BURN_LOG ("Session size %lli/Disc size %lli",
+ BRASERO_BURN_LOG ("Session size %" G_GOFFSET_FORMAT "/Disc size %" G_GOFFSET_FORMAT,
priv->session_blocks,
priv->disc_size);
diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
index f3aeebbe..4510fdf0 100644
--- a/libbrasero-burn/brasero-session.c
+++ b/libbrasero-burn/brasero-session.c
@@ -2278,7 +2278,7 @@ brasero_burn_session_start (BraseroBurnSession *self)
medium = brasero_drive_get_medium (priv->settings->burner);
BRASERO_BURN_LOG_DISC_TYPE (brasero_medium_get_status (medium), "media type\t=");
- BRASERO_BURN_LOG ("speed\t= %i", priv->settings->rate);
+ BRASERO_BURN_LOG ("speed\t= %" G_GUINT64_FORMAT, priv->settings->rate);
}
else {
brasero_track_type_set_has_image (type);
diff --git a/libbrasero-burn/brasero-xfer.c b/libbrasero-burn/brasero-xfer.c
index be449571..87dfd392 100644
--- a/libbrasero-burn/brasero-xfer.c
+++ b/libbrasero-burn/brasero-xfer.c
@@ -236,12 +236,12 @@ brasero_xfer_start (BraseroXferCtx *ctx,
/* Retrieve the size of all the data. */
if (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY) {
- BRASERO_BURN_LOG ("Downloading file (size = %lli)", g_file_info_get_size (info));
+ BRASERO_BURN_LOG ("Downloading file (size = %" G_GOFFSET_FORMAT ")", g_file_info_get_size
(info));
ctx->total_size = g_file_info_get_size (info);
}
else {
brasero_xfer_get_download_size (ctx, src, cancel, error);
- BRASERO_BURN_LOG ("Downloading directory (size = %lli)", ctx->total_size);
+ BRASERO_BURN_LOG ("Downloading directory (size = %" G_GOFFSET_FORMAT ")", ctx->total_size);
}
ctx->bytes_copied = 0;
diff --git a/libbrasero-burn/burn-job.c b/libbrasero-burn/burn-job.c
index 89efc148..fdb04bae 100644
--- a/libbrasero-burn/burn-job.c
+++ b/libbrasero-burn/burn-job.c
@@ -527,7 +527,7 @@ brasero_job_check_output_volume_space (BraseroJob *self,
g_object_unref (info);
/* get the size of the output this job is supposed to create */
- BRASERO_BURN_LOG ("Volume size %lli, output size %lli", vol_size, output_size);
+ BRASERO_BURN_LOG ("Volume size %" G_GUINT64_FORMAT ", output size %" G_GINT64_FORMAT, vol_size,
output_size);
/* it's fine here to check size in bytes */
if (output_size > vol_size) {
diff --git a/libbrasero-burn/burn-process.c b/libbrasero-burn/burn-process.c
index 4d0b2da3..636427c9 100644
--- a/libbrasero-burn/burn-process.c
+++ b/libbrasero-burn/burn-process.c
@@ -140,7 +140,7 @@ brasero_process_ask_argv (BraseroJob *job,
for (i = 0; priv->argv->pdata [i]; i++)
BRASERO_JOB_LOG_ARG (process,
"%s",
- priv->argv->pdata [i]);
+ (char*)(priv->argv->pdata [i]));
if (result != BRASERO_BURN_OK) {
g_strfreev ((gchar**) priv->argv->pdata);
diff --git a/libbrasero-burn/burn-task-ctx.c b/libbrasero-burn/burn-task-ctx.c
index a79de614..968637c9 100644
--- a/libbrasero-burn/burn-task-ctx.c
+++ b/libbrasero-burn/burn-task-ctx.c
@@ -597,7 +597,7 @@ brasero_task_ctx_set_output_size_for_current_track (BraseroTaskCtx *self,
if (bytes >= 0)
priv->size += bytes;
- BRASERO_BURN_LOG ("Task output modified %lli blocks %lli bytes",
+ BRASERO_BURN_LOG ("Task output modified %" G_GOFFSET_FORMAT " blocks %" G_GOFFSET_FORMAT " bytes",
priv->blocks,
priv->size);
diff --git a/libbrasero-burn/burn-task.c b/libbrasero-burn/burn-task.c
index 14974495..d0c884b2 100644
--- a/libbrasero-burn/burn-task.c
+++ b/libbrasero-burn/burn-task.c
@@ -490,7 +490,7 @@ brasero_task_set_track_output_size_default (BraseroTask *self,
if (result != BRASERO_BURN_OK)
return result;
- BRASERO_BURN_LOG ("Got a default image or stream track length %lli", sectors);
+ BRASERO_BURN_LOG ("Got a default image or stream track length %" G_GOFFSET_FORMAT, sectors);
brasero_task_ctx_set_output_size_for_current_track (BRASERO_TASK_CTX (self),
sectors,
bytes);
diff --git a/libbrasero-media/brasero-medium.c b/libbrasero-media/brasero-medium.c
index 6d334378..f508e82f 100644
--- a/libbrasero-media/brasero-medium.c
+++ b/libbrasero-media/brasero-medium.c
@@ -1179,7 +1179,7 @@ brasero_medium_get_capacity_CD_RW (BraseroMedium *self,
atip_data->desc->leadout_frame);
g_free (atip_data);
- BRASERO_MEDIA_LOG ("Format capacity %lli %lli",
+ BRASERO_MEDIA_LOG ("Format capacity %" G_GOFFSET_FORMAT " %" G_GOFFSET_FORMAT,
priv->block_num,
priv->block_size);
@@ -1277,7 +1277,7 @@ brasero_medium_get_capacity_DVD_RW (BraseroMedium *self,
end:
- BRASERO_MEDIA_LOG ("Format capacity %lli %lli",
+ BRASERO_MEDIA_LOG ("Format capacity %" G_GOFFSET_FORMAT " %" G_GOFFSET_FORMAT,
priv->block_num,
priv->block_size);
@@ -1711,7 +1711,7 @@ brasero_medium_track_get_info (BraseroMedium *self,
&& (priv->info & BRASERO_MEDIUM_CD)
&& !(priv->info & BRASERO_MEDIUM_ROM)) {
BRASERO_MEDIA_LOG ("Data track belongs to first session of multisession CD. "
- "Checking for real size (%i sectors currently).",
+ "Checking for real size (%" G_GOFFSET_FORMAT " sectors currently).",
track->blocks_num);
/* we test the pregaps blocks for TDB: these are special blocks
@@ -1739,7 +1739,7 @@ brasero_medium_track_get_info (BraseroMedium *self,
if (brasero_medium_track_written_SAO (handle, track_num, track->start)) {
track->blocks_num += 2;
- BRASERO_MEDIA_LOG ("Correcting track size (now %i)", track->blocks_num);
+ BRASERO_MEDIA_LOG ("Correcting track size (now %" G_GOFFSET_FORMAT ")",
track->blocks_num);
}
}
else
@@ -1747,7 +1747,7 @@ brasero_medium_track_get_info (BraseroMedium *self,
}
/* NOTE: DVD+RW, DVD-RW (restricted overwrite) never reach this function */
- BRASERO_MEDIA_LOG ("Track %i (session %i): type = %i start = %llu size = %llu",
+ BRASERO_MEDIA_LOG ("Track %i (session %i): type = %i start = %" G_GOFFSET_FORMAT " size = %"
G_GOFFSET_FORMAT,
track_num,
track->session,
track->type,
@@ -1800,7 +1800,7 @@ brasero_medium_track_set_leadout_DVDR_blank (BraseroMedium *self,
leadout->start = 0;
leadout->blocks_num = BRASERO_GET_32 (current->blocks_num);
- BRASERO_MEDIA_LOG ("Leadout (through READ FORMAT CAPACITIES): start = %llu size = %llu",
+ BRASERO_MEDIA_LOG ("Leadout (through READ FORMAT CAPACITIES): start = %" G_GOFFSET_FORMAT " size = %"
G_GOFFSET_FORMAT,
leadout->start,
leadout->blocks_num);
@@ -1839,7 +1839,7 @@ brasero_medium_track_set_leadout_CDR_blank (BraseroMedium *self,
/* of course it starts at 0 since it's empty */
leadout->start = 0;
- BRASERO_MEDIA_LOG ("Leadout (through READ ATIP): start = %llu size = %llu",
+ BRASERO_MEDIA_LOG ("Leadout (through READ ATIP): start = %" G_GOFFSET_FORMAT " size = %"
G_GOFFSET_FORMAT,
leadout->start,
leadout->blocks_num);
@@ -1941,7 +1941,7 @@ brasero_medium_track_set_leadout (BraseroMedium *self,
if (!leadout->blocks_num) {
leadout->blocks_num = BRASERO_GET_32 (track_info.track_size);
- BRASERO_MEDIA_LOG ("Using track size %d", leadout->blocks_num);
+ BRASERO_MEDIA_LOG ("Using track size %" G_GOFFSET_FORMAT, leadout->blocks_num);
}
if (!leadout->blocks_num
@@ -1951,7 +1951,7 @@ brasero_medium_track_set_leadout (BraseroMedium *self,
leadout,
code);
- BRASERO_MEDIA_LOG ("Leadout: start = %llu size = %llu",
+ BRASERO_MEDIA_LOG ("Leadout: start = %" G_GOFFSET_FORMAT " size = %" G_GOFFSET_FORMAT,
leadout->start,
leadout->blocks_num);
@@ -2002,7 +2002,7 @@ brasero_medium_add_DVD_plus_RW_leadout (BraseroMedium *self)
* buggy */
priv->next_wr_add = 0;
- BRASERO_MEDIA_LOG ("Adding fabricated leadout start = %llu length = %llu",
+ BRASERO_MEDIA_LOG ("Adding fabricated leadout start = %" G_GOFFSET_FORMAT " length = %"
G_GOFFSET_FORMAT,
leadout->start,
leadout->blocks_num);
}
@@ -2104,7 +2104,7 @@ tryagain:
* which have only one track: the first. Since it's not
* possible to know the amount of data that were really
* written in this session, read the filesystem. */
- BRASERO_MEDIA_LOG ("DVD+RW (DL) or DVD-RW (restricted overwrite) checking volume size
(start = %i)", track->start);
+ BRASERO_MEDIA_LOG ("DVD+RW (DL) or DVD-RW (restricted overwrite) checking volume size
(start = %" G_GOFFSET_FORMAT ")", track->start);
track->session = 1;
track->start = 0;
result = brasero_medium_track_volume_size (self,
@@ -2122,7 +2122,7 @@ tryagain:
}
else {
priv->next_wr_add = 0;
- BRASERO_MEDIA_LOG ("Track 1 (session %i): type = %i start = %llu size = %llu",
+ BRASERO_MEDIA_LOG ("Track 1 (session %i): type = %i start = %"
G_GOFFSET_FORMAT " size = %" G_GOFFSET_FORMAT,
track->session,
track->type,
track->start,
diff --git a/libbrasero-media/brasero-units.h b/libbrasero-media/brasero-units.h
index 0be8ab80..53c08feb 100644
--- a/libbrasero-media/brasero-units.h
+++ b/libbrasero-media/brasero-units.h
@@ -71,11 +71,11 @@ G_BEGIN_DECLS
**/
#define BRASERO_DURATION_TO_BYTES(duration) \
- ((gint64) (duration) * 75LL * 2352LL / 1000000000LL + \
+ (gint64) ((gint64) (duration) * 75LL * 2352LL / 1000000000LL + \
(((gint64) ((duration) * 75LL * 2352LL) % 1000000000LL) ? 1:0))
#define BRASERO_DURATION_TO_SECTORS(duration) \
- ((gint64) (duration) * 75LL / 1000000000LL + \
+ (gint64) ((gint64) (duration) * 75LL / 1000000000LL + \
(((gint64) ((duration) * 75LL) % 1000000000LL) ? 1:0))
#define BRASERO_BYTES_TO_SECTORS(size, secsize) \
diff --git a/libbrasero-media/burn-volume-source.c b/libbrasero-media/burn-volume-source.c
index 12a8135f..32171ce2 100644
--- a/libbrasero-media/burn-volume-source.c
+++ b/libbrasero-media/burn-volume-source.c
@@ -75,7 +75,7 @@ brasero_volume_source_seek_fd (BraseroVolSrc *src,
if (fseeko (src->data, (guint64) (block * ISO9660_BLOCK_SIZE), whence) == -1) {
int errsv = errno;
- BRASERO_MEDIA_LOG ("fseeko () failed at block %i (= %lli bytes) (%s)",
+ BRASERO_MEDIA_LOG ("fseeko () failed at block %i (= %" G_GUINT64_FORMAT " bytes) (%s)",
block,
(guint64) (block * ISO9660_BLOCK_SIZE),
g_strerror (errsv));
@@ -143,7 +143,7 @@ brasero_volume_source_readcd_device_handle (BraseroVolSrc *src,
/* Give it a last chance if the code is BRASERO_SCSI_INVALID_TRACK_MODE */
if (code == BRASERO_SCSI_INVALID_TRACK_MODE) {
- BRASERO_MEDIA_LOG ("Wrong track mode autodetecting mode for block %i",
+ BRASERO_MEDIA_LOG ("Wrong track mode autodetecting mode for block %" G_GUINT64_FORMAT,
src->position);
for (src->data_mode = BRASERO_SCSI_BLOCK_TYPE_CDDA;
@@ -204,7 +204,7 @@ brasero_volume_source_read10_device_handle (BraseroVolSrc *src,
return TRUE;
}
- BRASERO_MEDIA_LOG ("READ10 failed %s at %i",
+ BRASERO_MEDIA_LOG ("READ10 failed %s at %" G_GUINT64_FORMAT,
brasero_scsi_strerror (code),
src->position);
g_set_error (error,
diff --git a/libbrasero-media/scsi-get-configuration.c b/libbrasero-media/scsi-get-configuration.c
index 92598b78..9abe3787 100644
--- a/libbrasero-media/scsi-get-configuration.c
+++ b/libbrasero-media/scsi-get-configuration.c
@@ -191,7 +191,7 @@ brasero_mmc2_get_configuration_feature (BraseroDeviceHandle *handle,
/* make sure the desc is the one we want */
if (hdr && BRASERO_GET_16 (hdr->desc->code) != type) {
- BRASERO_MEDIA_LOG ("Wrong type returned %d", hdr->desc->code);
+ BRASERO_MEDIA_LOG ("Wrong type returned %d", BRASERO_GET_16 (hdr->desc->code));
BRASERO_SCSI_SET_ERRCODE (error, BRASERO_SCSI_TYPE_MISMATCH);
g_free (hdr);
diff --git a/libbrasero-media/scsi-read-track-information.c b/libbrasero-media/scsi-read-track-information.c
index 37644f25..7798e872 100644
--- a/libbrasero-media/scsi-read-track-information.c
+++ b/libbrasero-media/scsi-read-track-information.c
@@ -148,7 +148,7 @@ brasero_read_track_info (BraseroRdTrackInfoCDB *cdb,
res = brasero_scsi_command_issue_sync (cdb, info, datasize, error);
if (res == BRASERO_SCSI_OK) {
if (datasize != BRASERO_GET_16 (info->len) + sizeof (info->len))
- BRASERO_MEDIA_LOG ("Sizes mismatch asked %i / received %i",
+ BRASERO_MEDIA_LOG ("Sizes mismatch asked %i / received %zu",
datasize,
BRASERO_GET_16 (info->len) + sizeof (info->len));
diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
index 19433689..f8505d5a 100644
--- a/libbrasero-utils/brasero-metadata.c
+++ b/libbrasero-utils/brasero-metadata.c
@@ -1027,7 +1027,7 @@ brasero_metadata_process_element_messages (BraseroMetadata *self,
else
priv->silence->end = pos;
- BRASERO_UTILS_LOG ("silence detected at %lli", pos);
+ BRASERO_UTILS_LOG ("silence detected at %" G_GINT64_FORMAT, pos);
}
else if (priv->silence) {
BRASERO_UTILS_LOG ("silence finished");
@@ -1131,7 +1131,7 @@ brasero_metadata_get_duration (BraseroMetadata *self,
return brasero_metadata_completed (self);
}
- BRASERO_UTILS_LOG ("Found duration %lli for %s", duration, priv->info->uri);
+ BRASERO_UTILS_LOG ("Found duration %" G_GINT64_FORMAT " for %s", duration, priv->info->uri);
priv->info->len = duration;
return brasero_metadata_success (self);
diff --git a/plugins/cdrkit/burn-readom.c b/plugins/cdrkit/burn-readom.c
index 02d79348..8df099fb 100644
--- a/plugins/cdrkit/burn-readom.c
+++ b/plugins/cdrkit/burn-readom.c
@@ -172,7 +172,7 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
end = g_value_get_uint64 (value);
BRASERO_JOB_LOG (readom,
- "reading from sector %lli to %lli",
+ "reading from sector %" G_GUINT64_FORMAT " to %" G_GUINT64_FORMAT,
start,
end);
g_ptr_array_add (argv, g_strdup_printf ("-sectors=%"G_GINT64_FORMAT"-%"G_GINT64_FORMAT,
@@ -197,7 +197,7 @@ brasero_readom_argv_set_iso_boundary (BraseroReadom *readom,
&start);
BRASERO_JOB_LOG (readom,
- "reading %i from sector %lli to %lli",
+ "reading %i from sector %" G_GOFFSET_FORMAT " to %" G_GOFFSET_FORMAT,
brasero_track_disc_get_track_num (BRASERO_TRACK_DISC (track)),
start,
start + nb_blocks);
diff --git a/plugins/cdrkit/burn-wodim.c b/plugins/cdrkit/burn-wodim.c
index be7e5b92..91402baa 100644
--- a/plugins/cdrkit/burn-wodim.c
+++ b/plugins/cdrkit/burn-wodim.c
@@ -645,7 +645,7 @@ brasero_wodim_write_inf (BraseroWodim *wodim,
brasero_track_stream_get_length (BRASERO_TRACK_STREAM (track), &length);
sectors = BRASERO_DURATION_TO_SECTORS (length);
- BRASERO_JOB_LOG (wodim, "got track length %lli %lli", length, sectors);
+ BRASERO_JOB_LOG (wodim, "got track length %" G_GUINT64_FORMAT " %" G_GINT64_FORMAT, length, sectors);
string = g_strdup_printf ("Tracklength=\t%"G_GINT64_FORMAT", 0\n", sectors);
size = strlen (string);
b_written = write (fd, string, size);
diff --git a/plugins/cdrtools/burn-cdrecord.c b/plugins/cdrtools/burn-cdrecord.c
index 89ba6297..1c93bc5d 100644
--- a/plugins/cdrtools/burn-cdrecord.c
+++ b/plugins/cdrtools/burn-cdrecord.c
@@ -634,7 +634,7 @@ brasero_cdrecord_write_inf (BraseroCDRecord *cdrecord,
brasero_track_stream_get_length (BRASERO_TRACK_STREAM (track), &length);
sectors = BRASERO_DURATION_TO_SECTORS (length);
- BRASERO_JOB_LOG (cdrecord, "got track length %lli", length);
+ BRASERO_JOB_LOG (cdrecord, "got track length %" G_GUINT64_FORMAT, length);
string = g_strdup_printf ("Tracklength=\t%"G_GINT64_FORMAT", 0\n", sectors);
size = strlen (string);
b_written = write (fd, string, size);
diff --git a/plugins/checksum/burn-checksum-image.c b/plugins/checksum/burn-checksum-image.c
index d0f442ba..7413c336 100644
--- a/plugins/checksum/burn-checksum-image.c
+++ b/plugins/checksum/burn-checksum-image.c
@@ -252,7 +252,7 @@ brasero_checksum_image_checksum_fd_input (BraseroChecksumImage *self,
priv = BRASERO_CHECKSUM_IMAGE_PRIVATE (self);
- BRASERO_JOB_LOG (self, "Starting checksum generation live (size = %lli)", priv->total);
+ BRASERO_JOB_LOG (self, "Starting checksum generation live (size = %" G_GOFFSET_FORMAT ")",
priv->total);
result = brasero_job_set_nonblocking (BRASERO_JOB (self), error);
if (result != BRASERO_BURN_OK)
return result;
diff --git a/plugins/dvdcss/burn-dvdcss.c b/plugins/dvdcss/burn-dvdcss.c
index f6895b82..3ad23900 100644
--- a/plugins/dvdcss/burn-dvdcss.c
+++ b/plugins/dvdcss/burn-dvdcss.c
@@ -271,7 +271,7 @@ brasero_dvdcss_create_scrambled_sectors_map (BraseroDvdcss *self,
range->start = extent->block;
range->end = extent->block + BRASERO_BYTES_TO_SECTORS (extent->size,
DVDCSS_BLOCK_SIZE);
- BRASERO_JOB_LOG (self, "From 0x%llx to 0x%llx", range->start,
range->end);
+ BRASERO_JOB_LOG (self, "From 0x%x to 0x%x", range->start, range->end);
g_queue_push_head (map, range);
if (extent->size == 0) {
diff --git a/plugins/transcode/burn-transcode.c b/plugins/transcode/burn-transcode.c
index 05f2b28a..25abf8b0 100644
--- a/plugins/transcode/burn-transcode.c
+++ b/plugins/transcode/burn-transcode.c
@@ -206,7 +206,7 @@ brasero_transcode_set_boundaries (BraseroTranscode *transcode)
priv->segment_start = BRASERO_DURATION_TO_BYTES (start);
priv->segment_end = BRASERO_DURATION_TO_BYTES (end);
- BRASERO_JOB_LOG (transcode, "settings track boundaries time = %lli %lli / bytes = %lli %lli",
+ BRASERO_JOB_LOG (transcode, "settings track boundaries time = %" G_GINT64_FORMAT " %" G_GINT64_FORMAT
" / bytes = %" G_GINT64_FORMAT " %" G_GINT64_FORMAT,
start, end,
priv->segment_start, priv->segment_end);
@@ -1149,8 +1149,8 @@ brasero_transcode_pad (BraseroTranscode *transcode, int fd, GError **error)
bytes2write = b_written - priv->pos;
BRASERO_JOB_LOG (transcode,
- "wrote %lli bytes (= %lli ns) out of %lli (= %lli ns)"
- "\n=> padding %lli bytes",
+ "wrote %" G_GINT64_FORMAT " bytes (= %" G_GUINT64_FORMAT " ns) out of %"
G_GINT64_FORMAT " (= %" G_GUINT64_FORMAT " ns)"
+ "\n=> padding %" G_GINT64_FORMAT " bytes",
priv->pos,
BRASERO_BYTES_TO_DURATION (priv->pos),
BRASERO_DURATION_TO_BYTES (length),
@@ -1164,8 +1164,8 @@ brasero_transcode_pad (BraseroTranscode *transcode, int fd, GError **error)
b_written = priv->pos;
bytes2write = (b_written % 2352) ? 2352 - (b_written % 2352):0;
BRASERO_JOB_LOG (transcode,
- "wrote %lli bytes (= %lli ns)"
- "\n=> padding %lli bytes",
+ "wrote %" G_GINT64_FORMAT " bytes (= %" G_GINT64_FORMAT " ns)"
+ "\n=> padding %" G_GINT64_FORMAT " bytes",
b_written,
priv->pos,
bytes2write);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
