Remove unnecessary casts from size_t to int

petere · petere · commit d5ab9df7774b · 2019-07-04T17:02:13.000+02:00
We can use the %zu format specifier directly, no need to cast to int.
diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons
@@ -36,7 +36,7 @@ ECPG: stmtExecuteStmt block
 
 				/* It must be cut off double quotation because new_variable() double-quotes. */
 				str[strlen(str) - 1] = '\0';
-				sprintf(length, "%d", (int) strlen(str));
+				sprintf(length, "%zu", strlen(str));
 				add_variable_to_tail(&argsinsert, new_variable(str, ECPGmake_simple_type(ECPGt_const, length, 0), 0), &no_indicator);
 			}
 			output_statement(cat_str(3, mm_strdup("execute"), mm_strdup("$0"), $1.type), 0, ECPGst_exec_with_exprlist);
@@ -63,7 +63,7 @@ ECPG: stmtPrepareStmt block
 
 				/* It must be cut off double quotation because new_variable() double-quotes. */
 				str[strlen(str) - 1] = '\0';
-				sprintf(length, "%d", (int) strlen(str));
+				sprintf(length, "%zu", strlen(str));
 				add_variable_to_tail(&argsinsert, new_variable(str, ECPGmake_simple_type(ECPGt_const, length, 0), 0), &no_indicator);
 			}
 			output_statement(cat_str(5, mm_strdup("prepare"), mm_strdup("$0"), $1.type, mm_strdup("as"), $1.stmt), 0, ECPGst_prepare);
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1099,7 +1099,7 @@ UsingValue: UsingConst
 		{
 			char *length = mm_alloc(32);
 
-			sprintf(length, "%d", (int) strlen($1));
+			sprintf(length, "%zu", strlen($1));
 			add_variable_to_head(&argsinsert, new_variable($1, ECPGmake_simple_type(ECPGt_const, length, 0), 0), &no_indicator);
 		}
 		| civar { $$ = EMPTY; }
@@ -1226,7 +1226,7 @@ IntConstVar: Iconst
 		{
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 
-			sprintf(length, "%d", (int) strlen($1));
+			sprintf(length, "%zu", strlen($1));
 			new_variable($1, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			$$ = $1;
 		}
@@ -1272,7 +1272,7 @@ AllConstVar: ecpg_fconst
 		{
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 
-			sprintf(length, "%d", (int) strlen($1));
+			sprintf(length, "%zu", strlen($1));
 			new_variable($1, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			$$ = $1;
 		}
@@ -1287,7 +1287,7 @@ AllConstVar: ecpg_fconst
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = cat2_str(mm_strdup("-"), $2);
 
-			sprintf(length, "%d", (int) strlen(var));
+			sprintf(length, "%zu", strlen(var));
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			$$ = var;
 		}
@@ -1297,7 +1297,7 @@ AllConstVar: ecpg_fconst
 			char *length = mm_alloc(sizeof(int) * CHAR_BIT * 10 / 3);
 			char *var = cat2_str(mm_strdup("-"), $2);
 
-			sprintf(length, "%d", (int) strlen(var));
+			sprintf(length, "%zu", strlen(var));
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			$$ = var;
 		}
@@ -1308,7 +1308,7 @@ AllConstVar: ecpg_fconst
 			char *var = $1 + 1;
 
 			var[strlen(var) - 1] = '\0';
-			sprintf(length, "%d", (int) strlen(var));
+			sprintf(length, "%zu", strlen(var));
 			new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);
 			$$ = var;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1099,7 +1099,7 @@ UsingValue: UsingConst`
`1099`	`1099`	`{`
`1100`	`1100`	`char *length = mm_alloc(32);`
`1101`	`1101`
`1102`		`- sprintf(length, "%d", (int) strlen($1));`
	`1102`	`+ sprintf(length, "%zu", strlen($1));`
`1103`	`1103`	`add_variable_to_head(&argsinsert, new_variable($1, ECPGmake_simple_type(ECPGt_const, length, 0), 0), &no_indicator);`
`1104`	`1104`	`}`
`1105`	`1105`	`\| civar { $$ = EMPTY; }`
`@@ -1226,7 +1226,7 @@ IntConstVar: Iconst`
`1226`	`1226`	`{`
`1227`	`1227`	`char length = mm_alloc(sizeof(int) CHAR_BIT * 10 / 3);`
`1228`	`1228`
`1229`		`- sprintf(length, "%d", (int) strlen($1));`
	`1229`	`+ sprintf(length, "%zu", strlen($1));`
`1230`	`1230`	`new_variable($1, ECPGmake_simple_type(ECPGt_const, length, 0), 0);`
`1231`	`1231`	`$$ = $1;`
`1232`	`1232`	`}`
`@@ -1272,7 +1272,7 @@ AllConstVar: ecpg_fconst`
`1272`	`1272`	`{`
`1273`	`1273`	`char length = mm_alloc(sizeof(int) CHAR_BIT * 10 / 3);`
`1274`	`1274`
`1275`		`- sprintf(length, "%d", (int) strlen($1));`
	`1275`	`+ sprintf(length, "%zu", strlen($1));`
`1276`	`1276`	`new_variable($1, ECPGmake_simple_type(ECPGt_const, length, 0), 0);`
`1277`	`1277`	`$$ = $1;`
`1278`	`1278`	`}`
`@@ -1287,7 +1287,7 @@ AllConstVar: ecpg_fconst`
`1287`	`1287`	`char length = mm_alloc(sizeof(int) CHAR_BIT * 10 / 3);`
`1288`	`1288`	`char *var = cat2_str(mm_strdup("-"), $2);`
`1289`	`1289`
`1290`		`- sprintf(length, "%d", (int) strlen(var));`
	`1290`	`+ sprintf(length, "%zu", strlen(var));`
`1291`	`1291`	`new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);`
`1292`	`1292`	`$$ = var;`
`1293`	`1293`	`}`
`@@ -1297,7 +1297,7 @@ AllConstVar: ecpg_fconst`
`1297`	`1297`	`char length = mm_alloc(sizeof(int) CHAR_BIT * 10 / 3);`
`1298`	`1298`	`char *var = cat2_str(mm_strdup("-"), $2);`
`1299`	`1299`
`1300`		`- sprintf(length, "%d", (int) strlen(var));`
	`1300`	`+ sprintf(length, "%zu", strlen(var));`
`1301`	`1301`	`new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);`
`1302`	`1302`	`$$ = var;`
`1303`	`1303`	`}`
`@@ -1308,7 +1308,7 @@ AllConstVar: ecpg_fconst`
`1308`	`1308`	`char *var = $1 + 1;`
`1309`	`1309`
`1310`	`1310`	`var[strlen(var) - 1] = '\0';`
`1311`		`- sprintf(length, "%d", (int) strlen(var));`
	`1311`	`+ sprintf(length, "%zu", strlen(var));`
`1312`	`1312`	`new_variable(var, ECPGmake_simple_type(ECPGt_const, length, 0), 0);`
`1313`	`1313`	`$$ = var;`
`1314`	`1314`	`}`