mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

iscsi: fix misleading error logging in config.c

Browse Source 
This fixes four similar instances of a very misleading and confusing logging
statement, which would print a "Wrong value" that had already been corrected by
the check function.

Signed-off-by: David Butterfield <dab21774@gmail.com>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7112 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2017-04-13 23:15:17 +00:00
parent baba3ad195
commit b71fa76b5b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
iscsi-scst/usr/config.c
View File

@@ -856,11 +856,12 @@ int config_params_set(u32 tid, u64 sid, int type, u32 partial,
if (type == key_session) {
for (i = 0; i < session_key_last; i++) {
uint32_t in_val = params[i].val;
if (partial & (1 << i)) {
err = params_check_val(session_keys, i, &params[i].val);
if (err < 0) {
log_error("Wrong value %u for parameter %s\n",
params[i].val, session_keys[i].name);
log_error("%s: Wrong value %u->%u for session parameter %s\n",
__func__, in_val, params[i].val, session_keys[i].name);
goto out;
}
}
@@ -871,11 +872,12 @@ int config_params_set(u32 tid, u64 sid, int type, u32 partial,
}
} else {
for (i = 0; i < target_key_last; i++) {
uint32_t in_val = params[i].val;
if (partial & (1 << i)) {
err = params_check_val(target_keys, i, &params[i].val);
if (err < 0) {
log_error("Wrong value %u for parameter %s\n",
params[i].val, target_keys[i].name);
log_error("%s: Wrong value %u->%u for target parameter %s\n",
__func__, in_val, params[i].val, target_keys[i].name);
goto out;
}
}
@@ -962,10 +964,11 @@ int config_parse_main(const char *data, u32 cookie)
continue;
}
uint32_t in_val = val;
res = params_check_val(target_keys, idx, &val);
if (res < 0) {
log_error("Wrong value %u for parameter %s\n",
val, target_keys[idx].name);
log_error("%s: Wrong value %u->%u for target parameter %s\n",
__func__, in_val, val, target_keys[idx].name);
continue;
}
target->target_params[idx] = val;
@@ -986,10 +989,11 @@ int config_parse_main(const char *data, u32 cookie)
continue;
}
uint32_t in_val = val;
res = params_check_val(session_keys, idx, &val);
if (res < 0) {
log_error("Wrong value %u for parameter %s\n",
val, session_keys[idx].name);
log_error("%s: Wrong value %u->%u for session parameter %s\n",
__func__, in_val, val, session_keys[idx].name);
continue;
}
target->session_params[idx] = val;