From 480200cdbd0907f57e6d9540c6050c2e68e10560 Mon Sep 17 00:00:00 2001
From: Leonardo Francisco <lewohart@proton.me>
Date: Wed, 8 Apr 2026 13:00:11 -0400
Subject: [PATCH] validity: remove unused variable assignments in database and
 pairing command functions

---
 libfprint/drivers/fpcmoc/fpc.c             | 3 ++-
 libfprint/drivers/validity/validity_db.c   | 1 -
 libfprint/drivers/validity/validity_pair.c | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libfprint/drivers/fpcmoc/fpc.c b/libfprint/drivers/fpcmoc/fpc.c
index 6547a64e..d67195ad 100644
--- a/libfprint/drivers/fpcmoc/fpc.c
+++ b/libfprint/drivers/fpcmoc/fpc.c
@@ -271,13 +271,14 @@ static void
 fpc_cmd_ssm_done (FpiSsm *ssm, FpDevice *dev, GError *error)
 {
   FpiDeviceFpcMoc *self = FPI_DEVICE_FPCMOC (dev);
-  CommandData *data = fpi_ssm_get_data (ssm);
+  CommandData *data = NULL;
 
   self->cmd_ssm = NULL;
   /* Notify about the SSM failure from here instead. */
   if (error)
     {
       fp_err ("%s error: %s ", G_STRFUNC, error->message);
+      data = fpi_ssm_get_data (ssm);
       if (data->callback)
         data->callback (self, NULL, error);
     }
diff --git a/libfprint/drivers/validity/validity_db.c b/libfprint/drivers/validity/validity_db.c
index a92e98a6..aa05c552 100644
--- a/libfprint/drivers/validity/validity_db.c
+++ b/libfprint/drivers/validity/validity_db.c
@@ -765,7 +765,6 @@ validity_db_build_finger_data (guint16       subtype,
   pos += 2;
   if (tid_len > 0)
     memcpy (&buf[pos], tid, tid_len);
-  pos += tid_len;
 
   /* Remaining 0x20 bytes are zero-filled from g_new0 */
 
diff --git a/libfprint/drivers/validity/validity_pair.c b/libfprint/drivers/validity/validity_pair.c
index f5f2696b..018e8930 100644
--- a/libfprint/drivers/validity/validity_pair.c
+++ b/libfprint/drivers/validity/validity_pair.c
@@ -509,7 +509,6 @@ validity_pair_build_partition_flash_cmd (const ValidityFlashIcParams *flash_ic,
   memcpy (cmd + offset, hdr5, hdr5_len);
   offset += hdr5_len;
   memcpy (cmd + offset, hdr3, hdr3_len);
-  offset += hdr3_len;
 
   *out_len = total;
   return cmd;