GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'master' into bfl

nfactor-troky
Con Kolivas 13 years ago
parent
8783db0dc3 6bbd753c06
commit
7ada258bbf
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      cgminer.c

6
cgminer.c
Unescape View File

@ -224,7 +224,7 @@ static const char def_conf[] = "cgminer.conf";
static bool config_loaded; static bool config_loaded;
static int include_count; static int include_count;
#define JSON_INCLUDE_CONF "include" #define JSON_INCLUDE_CONF "include"
#define JSON_LOAD_ERROR "JSON decode of file '%s' failed" #define JSON_LOAD_ERROR "JSON decode of file '%s' failed\n %s"
#define JSON_LOAD_ERROR_LEN strlen(JSON_LOAD_ERROR) #define JSON_LOAD_ERROR_LEN strlen(JSON_LOAD_ERROR)
#define JSON_MAX_DEPTH 10 #define JSON_MAX_DEPTH 10
#define JSON_MAX_DEPTH_ERR "Too many levels of JSON includes (limit 10) or a loop" #define JSON_MAX_DEPTH_ERR "Too many levels of JSON includes (limit 10) or a loop"
@ -1105,11 +1105,11 @@ static char *load_config(const char *arg, void __maybe_unused *unused)
config = json_load_file(arg, &err); config = json_load_file(arg, &err);
#endif #endif
if (!json_is_object(config)) { if (!json_is_object(config)) {
json_error = malloc(JSON_LOAD_ERROR_LEN + strlen(arg)); json_error = malloc(JSON_LOAD_ERROR_LEN + strlen(arg) + strlen(err.text));
if (!json_error) if (!json_error)
quit(1, "Malloc failure in json error"); quit(1, "Malloc failure in json error");
sprintf(json_error, JSON_LOAD_ERROR, arg); sprintf(json_error, JSON_LOAD_ERROR, arg, err.text);
return json_error; return json_error;
} }

Write Preview
Loading…
Cancel
Save