Browse Source

Merge branch 'set_device_funcs' into bfgminer

Luke Dashjr 11 years ago
parent
commit
6f04bd62d5
1 changed files with 5 additions and 1 deletions
  1. 5 1
      deviceapi.c

+ 5 - 1
deviceapi.c

@@ -935,6 +935,7 @@ void _set_auto_sdr(enum bfg_set_device_replytype * const out_success, const char
 		*out_success = SDR_ERR;
 		*out_success = SDR_ERR;
 }
 }
 
 
+static
 const char *_proc_set_device(struct cgpu_info * const proc, const char * const optname, const char * const newvalue, char * const replybuf, enum bfg_set_device_replytype * const out_success)
 const char *_proc_set_device(struct cgpu_info * const proc, const char * const optname, const char * const newvalue, char * const replybuf, enum bfg_set_device_replytype * const out_success)
 {
 {
 	const struct bfg_set_device_definition *sdf;
 	const struct bfg_set_device_definition *sdf;
@@ -963,6 +964,7 @@ const char *_proc_set_device(struct cgpu_info * const proc, const char * const o
 	return replybuf;
 	return replybuf;
 }
 }
 
 
+static
 const char *__proc_set_device(struct cgpu_info * const proc, char * const optname, char * const newvalue, char * const replybuf, enum bfg_set_device_replytype * const out_success)
 const char *__proc_set_device(struct cgpu_info * const proc, char * const optname, char * const newvalue, char * const replybuf, enum bfg_set_device_replytype * const out_success)
 {
 {
 	if (proc->drv->set_device)
 	if (proc->drv->set_device)
@@ -975,8 +977,10 @@ const char *__proc_set_device(struct cgpu_info * const proc, char * const optnam
 	return _proc_set_device(proc, optname, newvalue, replybuf, out_success);
 	return _proc_set_device(proc, optname, newvalue, replybuf, out_success);
 }
 }
 
 
-const char *proc_set_device(struct cgpu_info * const proc, char * const optname, char * const newvalue, char * const replybuf, enum bfg_set_device_replytype * const out_success)
+const char *proc_set_device(struct cgpu_info * const proc, char * const optname, char *newvalue, char * const replybuf, enum bfg_set_device_replytype * const out_success)
 {
 {
+	if (!newvalue)
+		newvalue = "";
 	const char * const rv = __proc_set_device(proc, optname, newvalue, replybuf, out_success);
 	const char * const rv = __proc_set_device(proc, optname, newvalue, replybuf, out_success);
 	switch (*out_success)
 	switch (*out_success)
 	{
 	{