slw2gmi

чување e5b5869a090104b9ec8b93db67ba87b326d54424
родитељ a81f62bd945a58eac45736a7d37528c6b55c8ae4
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu, 16 May 2024 21:30:02 +0200

slw2gmi.c: Fix a few instances of dead code and wrong types thanks to
LLVM's scan-build

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
slw2gmi.c
 | 
28
++++++++++++++--------------

измењених датотека: 1, додавања: 14(+), брисања: 14(-)
diff --git a/slw2gmi.c b/slw2gmi.c
@@ -827,8 +827,7 @@ read_tsv(FILE* output, const char* filename, tsv_callback_t callback)
 
 	while (!feof(tsv) && (!tsv_iter || tsv_lineno <= tsv_iter))
 	{
-		u8* eol	   = NULL;
-		size_t res = 0;
+		u8* eol = NULL;
 		if (!fgets((char*)bufline, BUFSIZE, tsv))
 			break;
 		eol = (u8*)strchr((char*)bufline, '\n');
@@ -848,9 +847,8 @@ read_tsv(FILE* output, const char* filename, tsv_callback_t callback)
 			if (tsv_lineno > 0
 				&& current_register < MAX_TSV_REGISTERS)
 			{
-				if ((res = strlcpy((char*)tsv_register
-							   [current_register],
-					     (char*)token, BUFSIZE))
+				if (strlcpy((char*)tsv_register[current_register],
+					    (char*)token, BUFSIZE)
 					>= BUFSIZE)
 					warning(1, (u8*)"strlcpy:%d: Overflow",
 						__LINE__);
@@ -952,9 +950,10 @@ process_tsv(FILE* output, const u8* arg_token,
 
 		tsv_iter    = 0;
 		u8* saveptr = NULL;
-		u8* args    = (u8*)strtok_r((char*)arg_token, " ",
-			   (char**)&saveptr);
-		args	    = (u8*)strtok_r(NULL, " ", (char**)&saveptr);
+		u8* args    = NULL;
+
+		(void)strtok_r((char*)arg_token, " ", (char**)&saveptr);
+		args = (u8*)strtok_r(NULL, " ", (char**)&saveptr);
 		if (!args)
 			exit(error(EINVAL,
 				(u8*)"process_tsv: Arguments required"));
@@ -964,7 +963,7 @@ process_tsv(FILE* output, const u8* arg_token,
 				(u8*)"process_tsv: First argument must be a "
 				     "string"));
 		if (!tsv_filename)
-			CALLOC(tsv_filename, u8, BUFSIZE);
+			CALLOC(tsv_filename, char, BUFSIZE);
 		u8* args_base = (u8*)strdup((char*)args + 1);
 		*(args_base + strlen((char*)args_base) - 1) = 0;
 		snprintf(tsv_filename, BUFSIZE, "%s/%s.tsv", input_dirname,
@@ -1349,9 +1348,10 @@ process_csv(FILE* output, const u8* arg_token,
 
 		csv_iter    = 0;
 		u8* saveptr = NULL;
-		u8* args    = (u8*)strtok_r((char*)arg_token, " ",
-			   (char**)&saveptr);
-		args	    = (u8*)strtok_r(NULL, " ", (char**)&saveptr);
+		u8* args    = NULL;
+
+		(void)strtok_r((char*)arg_token, " ", (char**)&saveptr);
+		args = (u8*)strtok_r(NULL, " ", (char**)&saveptr);
 		if (!args)
 			exit(error(EINVAL, (u8*)"read_csv: Arguments required"));
 		size_t args_len = strlen((char*)args);
@@ -1360,7 +1360,7 @@ process_csv(FILE* output, const u8* arg_token,
 				(u8*)"read_csv: First argument must be a "
 				     "string"));
 		if (!csv_filename)
-			CALLOC(csv_filename, u8, BUFSIZE);
+			CALLOC(csv_filename, char, BUFSIZE);
 		u8* args_base = (u8*)strdup((char*)args + 1);
 		*(args_base + strlen((char*)args_base) - 1) = 0;
 		snprintf(csv_filename, BUFSIZE, "%s/%s.csv", input_dirname,
@@ -1810,7 +1810,7 @@ process_incdir(FILE* output, const u8* token, const u8* link_prefix,
 	if (read_yaml_macros_and_links)
 		return 0;
 
-	arg = (u8*)strtok_r((char*)token, " ", (char**)&saveptr);
+	(void)strtok_r((char*)token, " ", (char**)&saveptr);
 	arg = (u8*)strtok_r(NULL, " ", (char**)&saveptr);
 	if (!arg)
 		exit(error(1, (u8*)"process_incdir: Arguments required"));