Просмотр исходного кода

[scan-build] Fix dead assignments.

These dead assignments were particularly bad, since they could prevent the right exit code from being returned by main().
Cyril Roelandt лет назад: 13
Родитель
Сommit
0143085912
2 измененных файлов с 12 добавлено и 10 удалено
  1. 6 6
      examples/axpy/axpy.c
  2. 6 4
      tests/datawizard/mpi_like_async.c

+ 6 - 6
examples/axpy/axpy.c

@@ -117,7 +117,7 @@ struct starpu_opencl_program opencl_program;
 
 int main(int argc, char **argv)
 {
-	int ret;
+	int ret, exit_value;
 
 	/* Initialize StarPU */
 	ret = starpu_init(NULL);
@@ -187,8 +187,8 @@ int main(int argc, char **argv)
 		ret = starpu_task_submit(task);
 		if (ret == -ENODEV)
 		{
-		     ret = 77;
-		     goto enodev;
+			exit_value = 77;
+			goto enodev;
 		}
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}
@@ -209,8 +209,8 @@ enodev:
 
 	FPRINTF(stderr, "AFTER y[0] = %2.2f (ALPHA = %2.2f)\n", vec_y[0], alpha);
 
-	if (ret != 77)
-		ret = check();
+	if (exit_value != 77)
+		exit_value = check();
 
 	starpu_free((void *)vec_x);
 	starpu_free((void *)vec_y);
@@ -222,5 +222,5 @@ enodev:
 	/* Stop StarPU */
 	starpu_shutdown();
 
-	return ret;
+	return exit_value;
 }

+ 6 - 4
tests/datawizard/mpi_like_async.c

@@ -376,6 +376,12 @@ int main(int argc, char **argv)
 	/* We check that the value in the "last" thread is valid */
 	starpu_data_handle_t last_handle = problem_data[nthreads - 1].handle;
 	starpu_data_acquire(last_handle, STARPU_R);
+
+#ifdef STARPU_USE_OPENCL
+        ret = starpu_opencl_unload_opencl(&opencl_program);
+        STARPU_CHECK_RETURN_VALUE(ret, "starpu_opencl_unload_opencl");
+#endif
+
 	ret = EXIT_SUCCESS;
 	if (problem_data[nthreads - 1].val != (nthreads * niter))
 	{
@@ -389,10 +395,6 @@ int main(int argc, char **argv)
 		starpu_data_unregister(problem_data[t].handle);
 	}
 
-#ifdef STARPU_USE_OPENCL
-        ret = starpu_opencl_unload_opencl(&opencl_program);
-        STARPU_CHECK_RETURN_VALUE(ret, "starpu_opencl_unload_opencl");
-#endif
 	starpu_shutdown();
 
 	STARPU_RETURN(ret);