Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
timeshift: fix the obvious printf type mismatch
  • Loading branch information
perexg committed Dec 30, 2015
1 parent 4ede1ef commit 0f069c7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/timeshift/timeshift_filemgr.c
Expand Up @@ -75,7 +75,8 @@ static void* timeshift_reaper_callback ( void *p )
tvhlog(LOG_ERR, "timeshift", "failed to remove %s [e=%s]",
dpath, strerror(errno));
} else {
tvhtrace("timeshift", "remove RAM segment (time %"PRItime_t", size %"PRId64")", tsf->time, (int64_t)tsf->size);
tvhtrace("timeshift", "remove RAM segment (time %"PRId64", size %"PRId64")",
tsf->time, (int64_t)tsf->size);
}

/* Free memory */
Expand Down Expand Up @@ -185,7 +186,8 @@ void timeshift_filemgr_remove
if (tsf->path)
tvhdebug("timeshift", "ts %d remove %s (size %"PRId64")", ts->id, tsf->path, (int64_t)tsf->size);
else
tvhdebug("timeshift", "ts %d RAM segment remove time %"PRItime_t" (size %"PRId64", alloc size %"PRId64")", ts->id, tsf->time, (int64_t)tsf->size, (int64_t)tsf->ram_size);
tvhdebug("timeshift", "ts %d RAM segment remove time %"PRId64" (size %"PRId64", alloc size %"PRId64")",
ts->id, tsf->time, (int64_t)tsf->size, (int64_t)tsf->ram_size);
}
TAILQ_REMOVE(&ts->files, tsf, link);
atomic_dec_u64(&timeshift_total_size, tsf->size);
Expand Down
2 changes: 1 addition & 1 deletion src/timeshift/timeshift_reader.c
Expand Up @@ -538,7 +538,7 @@ static void timeshift_trace_pkt
th_pkt_t *pkt = sm->sm_data;
tvhtrace("timeshift",
"ts %d pkt out - stream %d type %c pts %10"PRId64
" dts %10"PRId64 " dur %10d len %6zu time %14"PRItime_t,
" dts %10"PRId64 " dur %10d len %6zu time %14"PRId64,
ts->id,
pkt->pkt_componentindex,
pkt_frametype_to_char(pkt->pkt_frametype),
Expand Down

1 comment on commit 0f069c7

@ksooo
Copy link
Contributor

@ksooo ksooo commented on 0f069c7 Dec 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By any chance, is it feasable to backport the timeshift fixes to 4.0.x?

Please sign in to comment.