Tools: Refactor

tools/bufr_copy.c

@@ -55,8 +55,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)

tools/bufr_index_build.c

@@ -47,8 +47,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)

tools/grib_copy.c

@@ -59,8 +59,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)

tools/grib_index_build.c

@@ -46,8 +46,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)

tools/grib_merge.c

@@ -64,8 +64,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)

tools/grib_to_netcdf.c

@@ -3956,7 +3956,7 @@ struct KindValue
 
 int main(int argc, char* argv[])
 {
-    int i, ret = 0;
+    int i = 0;
 
     /* GRIB-413: Collect all program arguments into a string */
     const size_t maxLen = sizeof(argvString);
@@ -3969,9 +3969,7 @@ int main(int argc, char* argv[])
         if (i != argc - 1)
             strcat(argvString, " ");
     }
-    ret = grib_tool(argc, argv);
-
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)

tools/gts_copy.c

@@ -46,8 +46,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)

tools/metar_copy.c

@@ -46,8 +46,7 @@ int grib_options_count = sizeof(grib_options) / sizeof(grib_option);
 
 int main(int argc, char* argv[])
 {
-    int ret = grib_tool(argc, argv);
-    return ret;
+    return grib_tool(argc, argv);
 }
 
 int grib_tool_before_getopt(grib_runtime_options* options)