From: Matheus Afonso Martins Moreira <matheus.a.m.moreira@gmail.com>
Date: Mon, 26 Feb 2024 01:40:32 +0000 (-0300)
Subject: faces/totp: improve TOTP initializer labeling
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=46a4076f9ee1c7546040c9484baa17fda7fe246a;p=sensor-watch.git

faces/totp: improve TOTP initializer labeling

It now generates the string literal from the preprocessor token.
Even warns the user if the string is too long!
---

diff --git a/movement/watch_faces/complication/totp_face.c b/movement/watch_faces/complication/totp_face.c
index 83126a1..2edabd8 100644
--- a/movement/watch_faces/complication/totp_face.c
+++ b/movement/watch_faces/complication/totp_face.c
@@ -46,12 +46,12 @@ typedef struct {
     unsigned char *key;
 } totp_t;
 
-#define TOTP_INITIALIZER(label_1, label_2, key_array, algo, timestep) \
+#define TOTP_INITIALIZER(label, key_array, algo, timestep) \
     (const totp_t) { \
         .key = ((unsigned char *) key_array), \
         .key_length = sizeof(key_array) - 1, \
         .period = (timestep), \
-        .labels = { (label_1), (label_2) }, \
+        .labels = (#label), \
         .algorithm = (algo), \
     }
 
@@ -59,8 +59,8 @@ typedef struct {
 // Enter your TOTP key data below
 
 static totp_t credentials[] = {
-    TOTP_INITIALIZER('2', 'F', "JBSWY3DPEHPK3PXP", SHA1, 30),
-    TOTP_INITIALIZER('A', 'C', "JBSWY3DPEHPK3PXP", SHA1, 30),
+    TOTP_INITIALIZER(2F, "JBSWY3DPEHPK3PXP", SHA1, 30),
+    TOTP_INITIALIZER(AC, "JBSWY3DPEHPK3PXP", SHA1, 30),
 };
 
 // END OF KEY DATA.