opal/util/json: complain less about errors

For smaller things like type mismatch, errors should be handled by
caller rather than show_help

Signed-off-by: Luke Robison <lrbison@amazon.com>

Author: Luke Robison

opal/util/json/opal_json.c

@@ -19,8 +19,6 @@
 #define CHECK_OBJ_TYPE(obj, expected)                                                           \
     do {                                                                                        \
         if ((obj)->type != (expected)) {                                                        \
-            opal_show_help("help-json.txt", "Invalid argument type", true, __func__, #expected, \
-                           expected, (obj)->type);                                              \
             return OPAL_ERROR;                                                                  \
         }                                                                                       \
     } while (0)
@@ -97,7 +95,6 @@ int opal_json_load(const char *str, const size_t len, const opal_json_t **json)
 
     json_value *value = json_parse(str, len);
     if (!value) {
-        opal_show_help("help-json.txt", "Invalid JSON string", true);
         ret = OPAL_ERROR;
         goto out;
     }
@@ -114,7 +111,7 @@ int opal_json_load(const char *str, const size_t len, const opal_json_t **json)
     return ret;
 }
 
-int opal_json_load_file(const char *filename, const opal_json_t **json)
+int opal_json_load_file(const char *filename, const opal_json_t **json, int show_errors)
 {
     FILE *fp = NULL;
     size_t file_size;
@@ -123,7 +120,9 @@ int opal_json_load_file(const char *filename, const opal_json_t **json)
 
     fp = fopen(filename, "r");
     if (fp == NULL) {
-        opal_show_help("help-json.txt", "Unable to open file", true, filename);
+        if (show_errors) {
+            opal_show_help("help-json.txt", "Unable to open file", true, filename);
+        }
         ret = OPAL_ERROR;
         goto out;
     }
@@ -134,18 +133,25 @@ int opal_json_load_file(const char *filename, const opal_json_t **json)
 
     file_contents = (char *) malloc(file_size);
     if (!file_contents) {
-        opal_show_help("help-json.txt", "Memory allocation failure", true);
+        if (show_errors) {
+            opal_show_help("help-json.txt", "Memory allocation failure", true);
+        }
         ret = OPAL_ERROR;
         goto out;
     }
 
     if (file_size > fread(file_contents, 1, file_size, fp)) {
-        opal_show_help("help-json.txt", "Unable to read file", true, filename);
+        if (show_errors) {
+            opal_show_help("help-json.txt", "Unable to read file", true, filename);
+        }
         ret = OPAL_ERROR;
         goto out;
     }
 
     ret = opal_json_load(file_contents, file_size, json);
+    if (ret != OPAL_SUCCESS && show_errors) {
+        opal_show_help("help-json.txt", "Invalid JSON string", true);
+    }
 
 out:
     if (fp) {

opal/util/json/opal_json.h

@@ -21,7 +21,7 @@ const opal_json_t *json = NULL, *item = NULL;
 char *val;
 size_t len;
 
-ret = opal_json_load_file("my_file.json", &json); // Parse the file content into json
+ret = opal_json_load_file("my_file.json", &json, 1); // Parse the file content into json
 if (OPAL_SUCCESS != ret) {
      goto out;
 }
@@ -88,7 +88,7 @@ OPAL_DECLSPEC int opal_json_load(const char *str, const size_t len, const opal_j
  * @returns     OPAL_SUCCESS if the file is read and parsed successfully
  *              OPAL_ERROR otherwise
  */
-OPAL_DECLSPEC int opal_json_load_file(const char *filename, const opal_json_t **json);
+OPAL_DECLSPEC int opal_json_load_file(const char *filename, const opal_json_t **json, int show_errors);
 
 /**
  * Free JSON resources

test/util/opal_json.c

@@ -56,7 +56,7 @@ static int load_json(const char *string, enum INPUT_TYPE input_type, const opal_
         fclose(fp);
         close(fd);
         /* Load the input string from the temporary file */
-        ret = opal_json_load_file(filename, json);
+        ret = opal_json_load_file(filename, json, 1);
         /* Remember to delete the file */
         (void) remove(filename);
         break;