aaru-dps/libaaruformat
1
0
Fork 0
mirror of https://github.com/aaru-dps/libaaruformat.git synced 2025-12-16 19:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TRACE format specifiers for consistency in data types

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-08 19:28:11 +01:00
parent b1001f7062
commit c8a99d9538
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blocks/data.c
View File

@@ -155,7 +155,7 @@ int32_t process_data_block(aaruformatContext *ctx, IndexEntry *entry)
int error_no = 0; int error_no = 0;
if(block_header.compression == LzmaClauniaSubchannelTransform && block_header.type != CdSectorSubchannel) if(block_header.compression == LzmaClauniaSubchannelTransform && block_header.type != CdSectorSubchannel)
{ {
TRACE("Invalid compression type %d for block with data type %d, continuing...", block_header.compression, TRACE("Invalid compression type %u for block with data type %u, continuing...", block_header.compression,
block_header.type); block_header.type);
TRACE("Exiting process_data_block() = AARUF_STATUS_OK"); TRACE("Exiting process_data_block() = AARUF_STATUS_OK");
@@ -266,7 +266,7 @@ int32_t process_data_block(aaruformatContext *ctx, IndexEntry *entry)
if(read_bytes != block_header.length) if(read_bytes != block_header.length)
{ {
free(data); free(data);
fprintf(stderr, "Could not read block, continuing..."); TRACE("Could not read block, continuing...");
TRACE("Exiting process_data_block() = AARUF_STATUS_OK"); TRACE("Exiting process_data_block() = AARUF_STATUS_OK");
return AARUF_STATUS_OK; return AARUF_STATUS_OK;

2
src/dump.c
View File

@@ -471,7 +471,7 @@ int32_t aaruf_get_dumphw(void *context, uint8_t *buffer, size_t *length)
*/ */
int32_t aaruf_set_dumphw(void *context, uint8_t *data, size_t length) int32_t aaruf_set_dumphw(void *context, uint8_t *data, size_t length)
{ {
TRACE("Entering aaruf_set_dumphw(%p, %p, %d)", context, data, length); TRACE("Entering aaruf_set_dumphw(%p, %p, %zu)", context, data, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)

32
src/metadata.c
View File

@@ -93,7 +93,7 @@
*/ */
int32_t aaruf_get_geometry(const void *context, uint32_t *cylinders, uint32_t *heads, uint32_t *sectors_per_track) int32_t aaruf_get_geometry(const void *context, uint32_t *cylinders, uint32_t *heads, uint32_t *sectors_per_track)
{ {
TRACE("Entering aaruf_get_geometry(%p, %u, %u, %u)", context, *cylinders, *heads, *sectors_per_track); TRACE("Entering aaruf_get_geometry(%p, %p, %p, %p)", context, cylinders, heads, sectors_per_track);
const aaruformatContext *ctx = NULL; const aaruformatContext *ctx = NULL;
@@ -1943,7 +1943,7 @@ int32_t aaruf_set_drive_firmware_revision(void *context, const uint8_t *data, co
*/ */
int32_t aaruf_get_cicm_metadata(const void *context, uint8_t *buffer, size_t *length) int32_t aaruf_get_cicm_metadata(const void *context, uint8_t *buffer, size_t *length)
{ {
TRACE("Entering aaruf_get_cicm_metadata(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_cicm_metadata(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2098,7 +2098,7 @@ int32_t aaruf_get_cicm_metadata(const void *context, uint8_t *buffer, size_t *le
*/ */
int32_t aaruf_get_aaru_json_metadata(const void *context, uint8_t *buffer, size_t *length) int32_t aaruf_get_aaru_json_metadata(const void *context, uint8_t *buffer, size_t *length)
{ {
TRACE("Entering aaruf_get_aaru_json_metadata(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_aaru_json_metadata(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2336,7 +2336,7 @@ int32_t aaruf_set_aaru_json_metadata(void *context, uint8_t *data, size_t length
*/ */
int32_t aaruf_get_media_sequence(const void *context, int32_t *sequence, int32_t *last_sequence) int32_t aaruf_get_media_sequence(const void *context, int32_t *sequence, int32_t *last_sequence)
{ {
TRACE("Entering aaruf_get_media_sequence(%p, %d, %d)", context, *sequence, *last_sequence); TRACE("Entering aaruf_get_media_sequence(%p, %p, %p)", context, sequence, last_sequence);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2403,7 +2403,7 @@ int32_t aaruf_get_media_sequence(const void *context, int32_t *sequence, int32_t
*/ */
int32_t aaruf_get_creator(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_creator(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_creator(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_creator(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2475,7 +2475,7 @@ int32_t aaruf_get_creator(const void *context, uint8_t *buffer, int32_t *length)
*/ */
int32_t aaruf_get_comments(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_comments(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_comments(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_comments(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2545,7 +2545,7 @@ int32_t aaruf_get_comments(const void *context, uint8_t *buffer, int32_t *length
*/ */
int32_t aaruf_get_media_title(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_media_title(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_media_title(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_media_title(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2615,7 +2615,7 @@ int32_t aaruf_get_media_title(const void *context, uint8_t *buffer, int32_t *len
*/ */
int32_t aaruf_get_media_manufacturer(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_media_manufacturer(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_media_manufacturer(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_media_manufacturer(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2685,7 +2685,7 @@ int32_t aaruf_get_media_manufacturer(const void *context, uint8_t *buffer, int32
*/ */
int32_t aaruf_get_media_model(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_media_model(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_media_model(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_media_model(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2755,7 +2755,7 @@ int32_t aaruf_get_media_model(const void *context, uint8_t *buffer, int32_t *len
*/ */
int32_t aaruf_get_media_serial_number(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_media_serial_number(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_media_serial_number(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_media_serial_number(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2824,7 +2824,7 @@ int32_t aaruf_get_media_serial_number(const void *context, uint8_t *buffer, int3
*/ */
int32_t aaruf_get_media_barcode(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_media_barcode(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_media_barcode(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_media_barcode(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2895,7 +2895,7 @@ int32_t aaruf_get_media_barcode(const void *context, uint8_t *buffer, int32_t *l
*/ */
int32_t aaruf_get_media_part_number(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_media_part_number(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_media_part_number(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_media_part_number(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -2967,7 +2967,7 @@ int32_t aaruf_get_media_part_number(const void *context, uint8_t *buffer, int32_
*/ */
int32_t aaruf_get_drive_manufacturer(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_drive_manufacturer(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_drive_manufacturer(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_drive_manufacturer(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -3037,7 +3037,7 @@ int32_t aaruf_get_drive_manufacturer(const void *context, uint8_t *buffer, int32
*/ */
int32_t aaruf_get_drive_model(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_drive_model(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_drive_model(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_drive_model(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -3107,7 +3107,7 @@ int32_t aaruf_get_drive_model(const void *context, uint8_t *buffer, int32_t *len
*/ */
int32_t aaruf_get_drive_serial_number(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_drive_serial_number(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_drive_serial_number(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_drive_serial_number(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)
@@ -3177,7 +3177,7 @@ int32_t aaruf_get_drive_serial_number(const void *context, uint8_t *buffer, int3
*/ */
int32_t aaruf_get_drive_firmware_revision(const void *context, uint8_t *buffer, int32_t *length) int32_t aaruf_get_drive_firmware_revision(const void *context, uint8_t *buffer, int32_t *length)
{ {
TRACE("Entering aaruf_get_drive_firmware_revision(%p, %p, %d)", context, buffer, *length); TRACE("Entering aaruf_get_drive_firmware_revision(%p, %p, %p)", context, buffer, length);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context
if(context == NULL) if(context == NULL)

2
src/write.c
View File

@@ -2043,7 +2043,7 @@ int32_t aaruf_write_media_tag(void *context, const uint8_t *data, const int32_t
int32_t aaruf_write_sector_tag(void *context, const uint64_t sector_address, const bool negative, const uint8_t *data, int32_t aaruf_write_sector_tag(void *context, const uint64_t sector_address, const bool negative, const uint8_t *data,
const size_t length, const int32_t tag) const size_t length, const int32_t tag)
{ {
TRACE("Entering aaruf_write_sector_tag(%p, %" PRIu64 ", %d, %u, %p, %d)", context, sector_address, negative, data, TRACE("Entering aaruf_write_sector_tag(%p, %" PRIu64 ", %d, %p, %zu, %d)", context, sector_address, negative, data,
length, tag); length, tag);
// Check context is correct AaruFormat context // Check context is correct AaruFormat context