opal/dss: revamp opal_value_unload() to keep valgrind happy

ggouaillardet · ggouaillardet · commit 189d7b9480af · 2017-01-06T17:10:39.000+09:00
reorder tests to avoid valgrind complaining about uninitialized variables

Signed-off-by: Gilles Gouaillardet &lt;gilles@rist.or.jp&gt;
diff --git a/opal/dss/dss_load_unload.c b/opal/dss/dss_load_unload.c
@@ -10,7 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -289,7 +289,7 @@ int opal_value_unload(opal_value_t *kv,
         return OPAL_ERR_TYPE_MISMATCH;
     }
     if (NULL == data ||
-        (NULL == *data && OPAL_STRING != type && OPAL_BYTE_OBJECT != type)) {
+        (OPAL_STRING != type && OPAL_BYTE_OBJECT != type && NULL == *data)) {
         OPAL_ERROR_LOG(OPAL_ERR_BAD_PARAM);
         return OPAL_ERR_BAD_PARAM;
     }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Copyright (c) 2004-2005 The Regents of the University of California.`
`11`	`11`	`* All rights reserved.`
`12`	`12`	`* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.`
`13`		`- * Copyright (c) 2015 Research Organization for Information Science`
	`13`	`+ * Copyright (c) 2015-2017 Research Organization for Information Science`
`14`	`14`	`* and Technology (RIST). All rights reserved.`
`15`	`15`	`* $COPYRIGHT$`
`16`	`16`	`*`
`@@ -289,7 +289,7 @@ int opal_value_unload(opal_value_t *kv,`
`289`	`289`	`return OPAL_ERR_TYPE_MISMATCH;`
`290`	`290`	`}`
`291`	`291`	`if (NULL == data \|\|`
`292`		`- (NULL == *data && OPAL_STRING != type && OPAL_BYTE_OBJECT != type)) {`
	`292`	`+ (OPAL_STRING != type && OPAL_BYTE_OBJECT != type && NULL == *data)) {`
`293`	`293`	`OPAL_ERROR_LOG(OPAL_ERR_BAD_PARAM);`
`294`	`294`	`return OPAL_ERR_BAD_PARAM;`
`295`	`295`	`}`