Cleanup: iscsi_is_key_declarative() name is misleading, iscsi_is_key_internal() is...

git-svn-id: https://scst.svn.sourceforge.net/svnroot/scst/trunk@1247 d57e44dd-8a1f-0410-8b47-8ef2f437770f

diff --git a/iscsi-scst/include/iscsi_scst.h b/iscsi-scst/include/iscsi_scst.h
index 6023108..95e1ca3 100644 (file)
--- a/iscsi-scst/include/iscsi_scst.h
+++ b/iscsi-scst/include/iscsi_scst.h
@@ -141,7 +141,7 @@ struct iscsi_kern_register_info {
 #define ISCSI_PARAM_SET                _IOW('s', 7, struct iscsi_kern_param_info)
 #define ISCSI_PARAM_GET                _IOWR('s', 8, struct iscsi_kern_param_info)
 
-static inline int iscsi_is_key_declarative(int key)
+static inline int iscsi_is_key_internal(int key)
 {
        switch (key) {
        case key_max_xmit_data_length:

diff --git a/iscsi-scst/usr/iscsid.c b/iscsi-scst/usr/iscsid.c
index 8df0dbc..7c4ef59 100644 (file)
--- a/iscsi-scst/usr/iscsid.c
+++ b/iscsi-scst/usr/iscsid.c
@@ -363,7 +363,7 @@ static void text_scan_login(struct connection *conn)
 
                        switch (conn->session_param[idx].key_state) {
                        case KEY_STATE_START:
-                               if (iscsi_is_key_declarative(idx)) {
+                               if (iscsi_is_key_internal(idx)) {
                                        conn->session_param[idx].key_state = KEY_STATE_DONE;
                                        break;
                                }
@@ -417,13 +417,13 @@ static int text_check_param(struct connection *conn)
                        switch (conn->state) {
                        case STATE_LOGIN_FULL:
                        case STATE_SECURITY_FULL:
-                               if (iscsi_is_key_declarative(i)) {
+                               if (iscsi_is_key_internal(i)) {
                                        p[i].key_state = KEY_STATE_DONE;
                                        continue;
                                }
                                break;
                        case STATE_LOGIN:
-                               if (iscsi_is_key_declarative(i))
+                               if (iscsi_is_key_internal(i))
                                        continue;
                                memset(buf, 0, sizeof(buf));
                                param_val_to_str(session_keys, i, p[i].val, buf);
@@ -435,7 +435,7 @@ static int text_check_param(struct connection *conn)
                                p[i].key_state = KEY_STATE_REQUEST;
                                break;
                        default:
-                               if (iscsi_is_key_declarative(i))
+                               if (iscsi_is_key_internal(i))
                                        continue;
                        }
                        cnt++;