From c376c6fb02a01a2bc8415f15ccd7d8d9f12fd4c1 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 23 May 2018 19:03:25 +0200 Subject: [PATCH] lib: Fix type mismatch warnings in debug output --- libfprint/assembling.c | 4 ++-- libfprint/data.c | 2 +- libfprint/drivers/aesx660.c | 8 ++++---- libfprint/drivers/upeksonly.c | 4 ++-- libfprint/drivers/upektc.c | 2 +- libfprint/drivers/upektc_img.c | 4 ++-- libfprint/drivers/upekts.c | 6 +++--- libfprint/poll.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libfprint/assembling.c b/libfprint/assembling.c index 1052f99d..d34cf377 100644 --- a/libfprint/assembling.c +++ b/libfprint/assembling.c @@ -357,7 +357,7 @@ struct fp_img *fpi_assemble_lines(struct fpi_line_asmbl_ctx *ctx, unsigned char *output = g_malloc0(ctx->line_width * ctx->max_height); struct fp_img *img; - fp_dbg("%llu", g_get_real_time()); + fp_dbg("%"G_GINT64_FORMAT, g_get_real_time()); row1 = lines; for (i = 0; (i < lines_len - 1) && row1; i += 2) { @@ -388,7 +388,7 @@ struct fp_img *fpi_assemble_lines(struct fpi_line_asmbl_ctx *ctx, median_filter(offsets, (lines_len / 2) - 1, ctx->median_filter_size); - fp_dbg("offsets_filtered: %llu", g_get_real_time()); + fp_dbg("offsets_filtered: %"G_GINT64_FORMAT, g_get_real_time()); for (i = 0; i <= (lines_len / 2) - 1; i++) fp_dbg("%d", offsets[i]); row1 = lines; diff --git a/libfprint/data.c b/libfprint/data.c index 7e47db23..78f552c9 100644 --- a/libfprint/data.c +++ b/libfprint/data.c @@ -224,7 +224,7 @@ static struct fp_print_data *fpi_print_data_from_fp2_data(unsigned char *buf, raw_item = (struct fpi_print_data_item_fp2 *)raw_buf; item_len = GUINT32_FROM_LE(raw_item->length); - fp_dbg("item len %d, total_data_len %d", item_len, total_data_len); + fp_dbg("item len %d, total_data_len %d", (int) item_len, (int) total_data_len); if (total_data_len < item_len) { fp_err("corrupted fingerprint data"); break; diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c index 278fe810..9743b88d 100644 --- a/libfprint/drivers/aesx660.c +++ b/libfprint/drivers/aesx660.c @@ -341,7 +341,7 @@ static void capture_read_stripe_data_cb(struct libusb_transfer *transfer) goto out; } - fp_dbg("Got %d bytes of data", actual_len); + fp_dbg("Got %lu bytes of data", actual_len); do { copied = min(aesdev->buffer_max - aesdev->buffer_size, actual_len); memcpy(aesdev->buffer + aesdev->buffer_size, @@ -350,13 +350,13 @@ static void capture_read_stripe_data_cb(struct libusb_transfer *transfer) actual_len -= copied; data += copied; aesdev->buffer_size += copied; - fp_dbg("Copied %.4x bytes into internal buffer", + fp_dbg("Copied %.4lx bytes into internal buffer", copied); if (aesdev->buffer_size == aesdev->buffer_max) { if (aesdev->buffer_max == AESX660_HEADER_SIZE) { aesdev->buffer_max = aesdev->buffer[AESX660_RESPONSE_SIZE_LSB_OFFSET] + (aesdev->buffer[AESX660_RESPONSE_SIZE_MSB_OFFSET] << 8) + AESX660_HEADER_SIZE; - fp_dbg("Got frame, type %.2x size %.4x", + fp_dbg("Got frame, type %.2x size %.4lx", aesdev->buffer[AESX660_RESPONSE_TYPE_OFFSET], aesdev->buffer_max); continue; @@ -402,7 +402,7 @@ static void capture_run_state(struct fpi_ssm *ssm) capture_read_stripe_data_cb); break; case CAPTURE_SET_IDLE: - fp_dbg("Got %d frames\n", aesdev->strips_len); + fp_dbg("Got %lu frames\n", aesdev->strips_len); aesX660_send_cmd(ssm, set_idle_cmd, sizeof(set_idle_cmd), capture_set_idle_cmd_cb); break; diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c index e4dce7c8..73e8aec7 100644 --- a/libfprint/drivers/upeksonly.c +++ b/libfprint/drivers/upeksonly.c @@ -246,7 +246,7 @@ static void handoff_img(struct fp_img_dev *dev) sdev->rows = g_slist_reverse(sdev->rows); - fp_dbg("%d rows", sdev->num_rows); + fp_dbg("%lu rows", sdev->num_rows); img = fpi_assemble_lines(&assembling_ctx, sdev->rows, sdev->num_rows); g_slist_free_full(sdev->rows, g_free); @@ -312,7 +312,7 @@ static void row_complete(struct fp_img_dev *dev) */ if (sdev->num_blank > FINGER_REMOVED_THRESHOLD) { sdev->finger_state = FINGER_REMOVED; - fp_dbg("detected finger removal. Blank rows: %d, Full rows: %d", sdev->num_blank, sdev->num_rows); + fp_dbg("detected finger removal. Blank rows: %d, Full rows: %lu", sdev->num_blank, sdev->num_rows); handoff_img(dev); return; } diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c index f3d9b8ab..9d45091f 100644 --- a/libfprint/drivers/upektc.c +++ b/libfprint/drivers/upektc.c @@ -462,7 +462,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) upekdev->sum_threshold = UPEKET_SUM_THRESHOLD; break; default: - fp_err("Device variant %d is not known\n", driver_data); + fp_err("Device variant %lu is not known\n", driver_data); g_free(upekdev); dev->priv = NULL; return -ENODEV; diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c index 622b73e8..843bcffe 100644 --- a/libfprint/drivers/upektc_img.c +++ b/libfprint/drivers/upektc_img.c @@ -266,7 +266,7 @@ static void capture_read_data_cb(struct libusb_transfer *transfer) response_size = ((data[5] & 0x0f) << 8) + data[6]; response_size += 9; /* 7 bytes for header, 2 for CRC */ if (response_size > transfer->actual_length) { - fp_dbg("response_size is %d, actual_length is %d\n", + fp_dbg("response_size is %lu, actual_length is %d\n", response_size, transfer->actual_length); fp_dbg("Waiting for rest of transfer"); BUG_ON(upekdev->response_rest); @@ -331,7 +331,7 @@ static void capture_read_data_cb(struct libusb_transfer *transfer) upektc_img_process_image_frame(upekdev->image_bits + upekdev->image_size, data); BUG_ON(upekdev->image_size != IMAGE_SIZE); - fp_dbg("Image size is %d\n", upekdev->image_size); + fp_dbg("Image size is %lu\n", upekdev->image_size); img = fpi_img_new(IMAGE_SIZE); img->flags = FP_IMG_PARTIAL; memcpy(img->data, upekdev->image_bits, IMAGE_SIZE); diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c index b2971276..4e572b98 100644 --- a/libfprint/drivers/upekts.c +++ b/libfprint/drivers/upekts.c @@ -1011,7 +1011,7 @@ static void e_handle_resp00(struct fp_dev *dev, unsigned char *data, int result = 0; if (data_len != 14) { - fp_err("received 3001 poll response of %d bytes?", data_len); + fp_err("received 3001 poll response of %lu bytes?", data_len); fpi_drvcb_enroll_stage_completed(dev, -EPROTO, NULL, NULL); return; } @@ -1083,7 +1083,7 @@ static void e_handle_resp02(struct fp_dev *dev, unsigned char *data, int result = -EPROTO; if (data_len < sizeof(scan_comp)) { - fp_err("fingerprint data too short (%d bytes)", data_len); + fp_err("fingerprint data too short (%lu bytes)", data_len); } else if (memcmp(data, scan_comp, sizeof(scan_comp)) != 0) { fp_err("unrecognised data prefix %x %x %x %x %x", data[0], data[1], data[2], data[3], data[4]); @@ -1288,7 +1288,7 @@ static void v_handle_resp00(struct fp_dev *dev, unsigned char *data, int r = 0; if (data_len != 14) { - fp_err("received 3001 poll response of %d bytes?", data_len); + fp_err("received 3001 poll response of %lu bytes?", data_len); r = -EPROTO; goto out; } diff --git a/libfprint/poll.c b/libfprint/poll.c index a3722c64..cdae4f69 100644 --- a/libfprint/poll.c +++ b/libfprint/poll.c @@ -163,7 +163,7 @@ static int get_next_timeout_expiry(struct timeval *out, timerclear(out); } else { timersub(&next_timeout->expiry, &tv, out); - fp_dbg("next timeout in %d.%06ds", out->tv_sec, out->tv_usec); + fp_dbg("next timeout in %ld.%06lds", out->tv_sec, out->tv_usec); } return 1;