瀏覽代碼

minor fixes related to cppcheck

Nathalie Furmento 8 年之前
父節點
當前提交
1aad16d842
共有 4 個文件被更改,包括 12 次插入1 次删除
  1. 1 1
      src/core/perfmodel/perfmodel.c
  2. 5 0
      src/core/topology.c
  3. 5 0
      src/datawizard/filters.c
  4. 1 0
      src/util/starpu_task_insert.c

+ 1 - 1
src/core/perfmodel/perfmodel.c

@@ -482,7 +482,7 @@ void _starpu_set_perf_model_dirs()
 
 #ifdef STARPU_PERF_MODEL_DIR
 	/* use the directory specified at configure time */
-	snprintf(_perf_model_dir, _PERF_MODEL_DIR_MAXLEN, "%s", STARPU_PERF_MODEL_DIR);
+	snprintf(_perf_model_dir, _PERF_MODEL_DIR_MAXLEN, "%s", (char *)STARPU_PERF_MODEL_DIR);
 #else
 	snprintf(_perf_model_dir, _PERF_MODEL_DIR_MAXLEN, "%s/.starpu/sampling/", _starpu_get_home_path());
 #endif

+ 5 - 0
src/core/topology.c

@@ -768,6 +768,11 @@ _starpu_get_next_bindid (struct _starpu_machine_config *config,
 	int nhyperthreads = topology->nhwpus / topology->nhwcpus;
 	unsigned i;
 
+	if (npreferred)
+	{
+		STARPU_ASSERT_MSG(preferred_binding, "Passing NULL pointer for parameter preferred_binding with a non-0 value of parameter npreferred");
+	}
+
 	/* loop over the preference list */
 	for (current_preferred = 0;
 	     current_preferred < npreferred;

+ 5 - 0
src/datawizard/filters.c

@@ -197,6 +197,11 @@ static void _starpu_data_partition(starpu_data_handle_t initial_handle, starpu_d
 
 	_starpu_data_unregister_ram_pointer(initial_handle);
 
+	if (nparts && !inherit_state)
+	{
+		STARPU_ASSERT_MSG(childrenp, "Passing NULL pointer for parameter childrenp while parameter inherit_state is 0");
+	}
+
 	for (i = 0; i < nparts; i++)
 	{
 		starpu_data_handle_t child;

+ 1 - 0
src/util/starpu_task_insert.c

@@ -49,6 +49,7 @@ void _starpu_codelet_unpack_args_and_copyleft(char *cl_arg, void *_buffer, size_
 		// NULL was the initial end marker, we now use 0
 		// 0 and NULL should be the same value, but we
 		// keep both equalities for systems on which they could be different
+		// cppcheck-suppress duplicateExpression
 		if(argptr == 0 || argptr == NULL)
 			break;