scandata: Syntactic sugar in SymId table initialisation

ISO/IEC 9899:2017 section 6.7.9(14) "An array of character type may be initialized by a character string literal... Successive bytes of the string literal (including the terminating null character if there is room...) initialize the elements of the array."
gs1 · Apr 22, 2024 · 434f1e8 · 434f1e8
1 parent c9a8496
commit 434f1e8
Showing 1 changed file with 29 additions and 30 deletions.
diff --git a/src/c-lib/scandata.c b/src/c-lib/scandata.c
@@ -44,44 +44,43 @@ struct symIdEntry {
 };
 
 
-#define SYM(i1, i2, a, s) {		\
-	.symId = { i1, i2 },		\
-	.aiMode = aiMode_##a,		\
-	.sym = s,			\
+#define SYM(i, a, s) {		\
+	.symId = i,		\
+	.aiMode = aiMode_##a,	\
+	.sym = s,		\
 }
 
-
 /*
  *  First matching instance in a lookup is the default
  *
  */
 static const struct symIdEntry symIdTable[] = {
-	SYM( 'C','1', AI,     gs1_encoder_sGS1_128_CCA        ),
-	SYM( 'C','1', AI,     gs1_encoder_sGS1_128_CCC        ),
-	SYM( 'E','0', NON_AI, gs1_encoder_sEAN13              ),
-	SYM( 'E','0', AI,     gs1_encoder_sEAN13              ),
-	SYM( 'E','0', NON_AI, gs1_encoder_sUPCA               ),
-	SYM( 'E','0', AI,     gs1_encoder_sUPCA               ),
-	SYM( 'E','0', NON_AI, gs1_encoder_sUPCE               ),
-	SYM( 'E','0', AI,     gs1_encoder_sUPCE               ),
-	SYM( 'E','4', NON_AI, gs1_encoder_sEAN8               ),
-	SYM( 'E','4', AI,     gs1_encoder_sEAN8               ),
-	SYM( 'e','0', AI,     gs1_encoder_sDataBarExpanded    ),
-	SYM( 'e','0', AI,     gs1_encoder_sDataBarOmni        ),
-	SYM( 'e','0', NON_AI, gs1_encoder_sDataBarOmni        ),
-	SYM( 'e','0', AI,     gs1_encoder_sDataBarTruncated   ),
-	SYM( 'e','0', NON_AI, gs1_encoder_sDataBarTruncated   ),
-	SYM( 'e','0', AI,     gs1_encoder_sDataBarStacked     ),
-	SYM( 'e','0', NON_AI, gs1_encoder_sDataBarStacked     ),
-	SYM( 'e','0', AI,     gs1_encoder_sDataBarStackedOmni ),
-	SYM( 'e','0', NON_AI, gs1_encoder_sDataBarStackedOmni ),
-	SYM( 'e','0', AI,     gs1_encoder_sDataBarLimited     ),
-	SYM( 'e','0', NON_AI, gs1_encoder_sDataBarLimited     ),
+	SYM( "C1", AI,     gs1_encoder_sGS1_128_CCA        ),
+	SYM( "C1", AI,     gs1_encoder_sGS1_128_CCC        ),
+	SYM( "E0", NON_AI, gs1_encoder_sEAN13              ),
+	SYM( "E0", AI,     gs1_encoder_sEAN13              ),
+	SYM( "E0", NON_AI, gs1_encoder_sUPCA               ),
+	SYM( "E0", AI,     gs1_encoder_sUPCA               ),
+	SYM( "E0", NON_AI, gs1_encoder_sUPCE               ),
+	SYM( "E0", AI,     gs1_encoder_sUPCE               ),
+	SYM( "E4", NON_AI, gs1_encoder_sEAN8               ),
+	SYM( "E4", AI,     gs1_encoder_sEAN8               ),
+	SYM( "e0", AI,     gs1_encoder_sDataBarExpanded    ),
+	SYM( "e0", AI,     gs1_encoder_sDataBarOmni        ),
+	SYM( "e0", NON_AI, gs1_encoder_sDataBarOmni        ),
+	SYM( "e0", AI,     gs1_encoder_sDataBarTruncated   ),
+	SYM( "e0", NON_AI, gs1_encoder_sDataBarTruncated   ),
+	SYM( "e0", AI,     gs1_encoder_sDataBarStacked     ),
+	SYM( "e0", NON_AI, gs1_encoder_sDataBarStacked     ),
+	SYM( "e0", AI,     gs1_encoder_sDataBarStackedOmni ),
+	SYM( "e0", NON_AI, gs1_encoder_sDataBarStackedOmni ),
+	SYM( "e0", AI,     gs1_encoder_sDataBarLimited     ),
+	SYM( "e0", NON_AI, gs1_encoder_sDataBarLimited     ),
 	// e0 is also shared with GS1-128 with CC
-	SYM( 'd','1', NON_AI, gs1_encoder_sDM                 ),
-	SYM( 'd','2', AI,     gs1_encoder_sDM                 ),
-	SYM( 'Q','1', NON_AI, gs1_encoder_sQR                 ),
-	SYM( 'Q','3', AI,     gs1_encoder_sQR                 ),
+	SYM( "d1", NON_AI, gs1_encoder_sDM                 ),
+	SYM( "d2", AI,     gs1_encoder_sDM                 ),
+	SYM( "Q1", NON_AI, gs1_encoder_sQR                 ),
+	SYM( "Q3", AI,     gs1_encoder_sQR                 ),
 };
 
 #undef SYM