Fix indentation and remove trailing spaces.

Signed-off-by: Erez Zilber <[EMAIL PROTECTED]>
---
 include/iscsi_if.h            |    2 +-
 include/iscsi_proto.h         |    6 ++--
 kernel/iscsi_tcp.c            |    2 +-
 kernel/libiscsi.c             |    4 +-
 kernel/libiscsi.h             |    2 +-
 kernel/scsi_transport_iscsi.c |    4 +-
 usr/actor.c                   |   12 +++++-----
 usr/auth.c                    |   50 ++++++++++++++++++++--------------------
 usr/config.h                  |    2 +-
 usr/discovery.c               |    4 +-
 usr/idbm.c                    |   16 ++++++------
 usr/initiator.c               |   14 +++++-----
 usr/initiator.h               |    4 +-
 usr/io.c                      |    4 +-
 usr/iscsi_sysfs.c             |   10 ++++----
 usr/iscsiadm.c                |   16 ++++++------
 usr/isns.c                    |    2 +-
 usr/list.h                    |    4 +-
 usr/login.c                   |    8 +++---
 usr/scsi.c                    |    4 +-
 usr/sha1.c                    |    6 ++--
 usr/sha1.h                    |    6 ++--
 22 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/include/iscsi_if.h b/include/iscsi_if.h
index 7ad582e..d6d7e7f 100644
--- a/include/iscsi_if.h
+++ b/include/iscsi_if.h
@@ -135,7 +135,7 @@ struct iscsi_uevent {
                        enum iscsi_tgt_dscvr    type;
                        uint32_t        host_no;
                        /*
-                        * enable = 1 to establish a new connection
+                        * enable = 1 to establish a new connection
                         * with the server. enable = 0 to disconnect
                         * from the server. Used primarily to switch
                         * from one iSNS server to another.
diff --git a/include/iscsi_proto.h b/include/iscsi_proto.h
index 916c02c..40b920e 100644
--- a/include/iscsi_proto.h
+++ b/include/iscsi_proto.h
@@ -36,9 +36,9 @@
  */
 #define ntoh24(p) (((p)[0] << 16) | ((p)[1] << 8) | ((p)[2]))
 #define hton24(p, v) { \
-        p[0] = (((v) >> 16) & 0xFF); \
-        p[1] = (((v) >> 8) & 0xFF); \
-        p[2] = ((v) & 0xFF); \
+       p[0] = (((v) >> 16) & 0xFF); \
+       p[1] = (((v) >> 8) & 0xFF); \
+       p[2] = ((v) & 0xFF); \
 }
 #define zero_data(p) {p[0]=0;p[1]=0;p[2]=0;}
 
diff --git a/kernel/iscsi_tcp.c b/kernel/iscsi_tcp.c
index 0d21d87..c6514dd 100644
--- a/kernel/iscsi_tcp.c
+++ b/kernel/iscsi_tcp.c
@@ -1822,7 +1822,7 @@ static int
 iscsi_tcp_host_get_param(struct Scsi_Host *shost, enum iscsi_host_param param,
                         char *buf)
 {
-        struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
+       struct iscsi_session *session = iscsi_hostdata(shost->hostdata);
        int len;
 
        switch (param) {
diff --git a/kernel/libiscsi.c b/kernel/libiscsi.c
index 31b6477..fb0a28a 100644
--- a/kernel/libiscsi.c
+++ b/kernel/libiscsi.c
@@ -476,7 +476,7 @@ static void iscsi_tmf_rsp(struct iscsi_conn *conn, struct 
iscsi_hdr *hdr)
 
 static void iscsi_send_nopout(struct iscsi_conn *conn, struct iscsi_nopin 
*rhdr)
 {
-        struct iscsi_nopout hdr;
+       struct iscsi_nopout hdr;
        struct iscsi_mgmt_task *mtask;
 
        if (!rhdr && conn->ping_mtask)
@@ -1887,7 +1887,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, 
uint32_t conn_idx)
        /* allocate login_mtask used for the login/text sequences */
        spin_lock_bh(&session->lock);
        if (!__kfifo_get(session->mgmtpool.queue,
-                         (void*)&conn->login_mtask,
+                        (void*)&conn->login_mtask,
                         sizeof(void*))) {
                spin_unlock_bh(&session->lock);
                goto login_mtask_alloc_fail;
diff --git a/kernel/libiscsi.h b/kernel/libiscsi.h
index 6f10518..7e9ca76 100644
--- a/kernel/libiscsi.h
+++ b/kernel/libiscsi.h
@@ -153,7 +153,7 @@ struct iscsi_conn {
        /*
         * conn_stop() flag: stop to recover, stop to terminate
         */
-        int                    stop_stage;
+       int                     stop_stage;
        struct timer_list       transport_timer;
        unsigned long           last_recv;
        unsigned long           last_ping;
diff --git a/kernel/scsi_transport_iscsi.c b/kernel/scsi_transport_iscsi.c
index e8f8cf1..f6bd075 100644
--- a/kernel/scsi_transport_iscsi.c
+++ b/kernel/scsi_transport_iscsi.c
@@ -1553,8 +1553,8 @@ static int iscsi_host_match(struct attribute_container 
*cont,
            shost->transportt->host_attrs.ac.class != &iscsi_host_class.class)
                return 0;
 
-        priv = to_iscsi_internal(shost->transportt);
-        return &priv->t.host_attrs.ac == cont;
+       priv = to_iscsi_internal(shost->transportt);
+       return &priv->t.host_attrs.ac == cont;
 }
 
 struct scsi_transport_template *
diff --git a/usr/actor.c b/usr/actor.c
index b487632..e9999c0 100644
--- a/usr/actor.c
+++ b/usr/actor.c
@@ -30,12 +30,12 @@ static volatile int poll_in_progress;
 static volatile uint64_t actor_jiffies = 0;
 
 #define actor_diff(_time1, _time2) ({ \
-        uint64_t __ret; \
-        if ((_time2) >= (_time1)) \
-           __ret = (_time2) - (_time1); \
-        else \
-           __ret = ((~0ULL) - (_time1)) + (_time2); \
-        __ret; \
+       uint64_t __ret; \
+       if ((_time2) >= (_time1)) \
+               __ret = (_time2) - (_time1); \
+       else \
+               __ret = ((~0ULL) - (_time1)) + (_time2); \
+       __ret; \
 })
 
 #define ACTOR_TICKS            actor_jiffies
diff --git a/usr/auth.c b/usr/auth.c
index 58b59a7..21d1a70 100644
--- a/usr/auth.c
+++ b/usr/auth.c
@@ -187,40 +187,40 @@ get_random_bytes(unsigned char *data, unsigned int length)
 {
 
        long r;
-        unsigned n;
+       unsigned n;
        int fd;
 
        fd = open("/dev/urandom", O_RDONLY);
-        while (length > 0) {
+       while (length > 0) {
 
                if (fd)
                        read(fd, &r, sizeof(long));
                else
                        r = rand();
-                r = r ^ (r >> 8);
-                r = r ^ (r >> 4);
-                n = r & 0x7;
+               r = r ^ (r >> 8);
+               r = r ^ (r >> 4);
+               n = r & 0x7;
 
                if (fd)
                        read(fd, &r, sizeof(long));
                else
                        r = rand();
-                r = r ^ (r >> 8);
-                r = r ^ (r >> 5);
-                n = (n << 3) | (r & 0x7);
+               r = r ^ (r >> 8);
+               r = r ^ (r >> 5);
+               n = (n << 3) | (r & 0x7);
 
                if (fd)
                        read(fd, &r, sizeof(long));
                else
                        r = rand();
 
-                r = r ^ (r >> 8);
-                r = r ^ (r >> 5);
-                n = (n << 2) | (r & 0x3);
+               r = r ^ (r >> 8);
+               r = r ^ (r >> 5);
+               n = (n << 2) | (r & 0x3);
 
-                *data++ = n;
-                length--;
-        }
+               *data++ = n;
+               length--;
+       }
        if (fd)
                close(fd);
 }
@@ -239,14 +239,14 @@ get_random_bytes(unsigned char *data, unsigned int length)
 
 size_t strlcpy(char *dest, const char *src, size_t size)
 {
-        size_t ret = strlen(src);
-
-        if (size) {
-                size_t len = (ret >= size) ? size-1 : ret;
-                memcpy(dest, src, len);
-                dest[len] = '\0';
-        }
-        return ret;
+       size_t ret = strlen(src);
+
+       if (size) {
+               size_t len = (ret >= size) ? size-1 : ret;
+               memcpy(dest, src, len);
+               dest[len] = '\0';
+       }
+       return ret;
 }
 
 /**
@@ -259,8 +259,8 @@ size_t strlcpy(char *dest, const char *src, size_t size)
 size_t strlcat(char *dest, const char *src, size_t count)
 {
        size_t dsize = strlen(dest);
-        size_t len = strlen(src);
-        size_t res = dsize + len;
+       size_t len = strlen(src);
+       size_t res = dsize + len;
 
        /* This would be a bug */
        if (dsize >= count) {
@@ -2081,7 +2081,7 @@ acl_dbg_status_to_text(int dbg_status)
 
 int
 acl_data(unsigned char *out_data, unsigned int *out_length,
-         unsigned char *in_data, unsigned int in_length)
+        unsigned char *in_data, unsigned int in_length)
 {
        if (*out_length < in_length)
                return 1;       /* error */
diff --git a/usr/config.h b/usr/config.h
index e767d6d..330cdb7 100644
--- a/usr/config.h
+++ b/usr/config.h
@@ -193,7 +193,7 @@ typedef struct iface_rec {
        char                    ipaddress[NI_MAXHOST];
        /*
         * TODO: we may have to make this bigger and interconnect
-        * specific for infinniband 
+        * specific for infiniband
         */
        char                    hwaddress[ISCSI_MAX_IFACE_LEN];
        char                    transport_name[ISCSI_TRANSPORT_NAME_MAXLEN];
diff --git a/usr/discovery.c b/usr/discovery.c
index c5b6ac0..6a7e578 100644
--- a/usr/discovery.c
+++ b/usr/discovery.c
@@ -75,7 +75,7 @@ int discovery_offload_sendtargets(idbm_t *db, int host_no, 
int do_login,
        if (resolve_address(drec->address, default_port, &ss)) {
                log_error("Cannot resolve host name %s.", drec->address);
                return EIO;
-       }       
+       }
        req.u.st.ss = ss;
 
        /*
@@ -1104,7 +1104,7 @@ repoll:
                        memset(data, 0, data_len);
                        if (!iscsi_io_recv_pdu(&session->conn[0],
                                               pdu, ISCSI_DIGEST_NONE, data,
-                                              data_len, ISCSI_DIGEST_NONE,
+                                              data_len, ISCSI_DIGEST_NONE,
                                               timeout)) {
                                log_debug(1, "discovery session to "
                                          "%s:%d failed to recv a PDU "
diff --git a/usr/idbm.c b/usr/idbm.c
index c76bed6..2e645dd 100644
--- a/usr/idbm.c
+++ b/usr/idbm.c
@@ -1073,7 +1073,7 @@ static int iface_get_next_id(void)
        }
 
        free(iface_conf);
-        return rc;
+       return rc;
 }
 
 struct iface_search {
@@ -1261,7 +1261,7 @@ int iface_match_bind_info(struct iface_rec *pattern, 
struct iface_rec *iface)
         * names and no binding info. There should only be one
         * iface with no binding info for each transport and that
         * is the "default" which is used for backward compat from
-        * when we did not have ifaces. 
+        * when we did not have ifaces.
         */
        if (!iface_is_bound(iface) &&
            !iface_is_bound(pattern))
@@ -1797,7 +1797,7 @@ read_iface:
                        break;
                else if (rc == 0)
                        (*found)++;
-               else 
+               else
                        rc = 0;
        }
 
@@ -1952,7 +1952,7 @@ idbm_discovery_read(idbm_t *db, discovery_rec_t *out_rec, 
char *addr, int port)
        idbm_recinfo_config(info, f);
        fclose(f);
 
-unlock:        
+unlock:
        idbm_unlock(db);
 free_info:
        free(portal);
@@ -2069,7 +2069,7 @@ static int idbm_rec_write(idbm_t *db, node_rec_t *rec)
        } else {
                rc = EINVAL;
                goto unlock;
-       }       
+       }
 
 mkdir_portal:
        snprintf(portal, PATH_MAX, "%s/%s/%s,%d,%d", NODE_CONFIG_DIR,
@@ -2441,7 +2441,7 @@ static void idbm_rm_disc_node_links(idbm_t *db, char 
*disc_dir)
                log_debug(5, "disc removal removing link %s %s %s %s",
                          target, address, port, iface_id);
 
-               memset(rec, 0, sizeof(*rec));   
+               memset(rec, 0, sizeof(*rec));
                strncpy(rec->name, target, TARGET_NAME_MAXLEN);
                rec->tpgt = atoi(tpgt);
                rec->conn[0].port = atoi(port);
@@ -2452,7 +2452,7 @@ static void idbm_rm_disc_node_links(idbm_t *db, char 
*disc_dir)
                        log_error("Could not delete node %s/%s/%s,%s/%s",
                                  NODE_CONFIG_DIR, target, address, port,
                                  iface_id);
-       }
+       }
 
        closedir(disc_dirfd);
 free_rec:
@@ -2534,7 +2534,7 @@ static int idbm_remove_disc_to_node_link(idbm_t *db, 
node_rec_t *rec,
        }
 
        log_debug(7, "found drec %s %d\n", tmprec->disc_address,
-                tmprec->disc_port); 
+                tmprec->disc_port);
        /* rm link from discovery source to node */
        memset(portal, 0, PATH_MAX);
        rc = setup_disc_to_node_link(portal, tmprec);
diff --git a/usr/initiator.c b/usr/initiator.c
index e8025b9..fb54a77 100644
--- a/usr/initiator.c
+++ b/usr/initiator.c
@@ -180,7 +180,7 @@ __check_iscsi_status_class(iscsi_session_t *session, int 
cid,
                        memset(&conn->failback_saddr, 0,
                                sizeof(struct sockaddr_storage));
                        conn->failback_saddr = conn->saddr;
-                        return CONN_LOGIN_IMM_REDIRECT_RETRY;
+                       return CONN_LOGIN_IMM_REDIRECT_RETRY;
                default:
                        log_error("conn %d login rejected: redirection "
                                "type 0x%x not supported",
@@ -655,9 +655,9 @@ queue_delayed_reopen(queue_task_t *qtask, int delay)
        log_debug(4, "Requeue reopen attempt in %d secs\n", delay);
 
        /*
-        * iscsi_login_eh can handle the login resched as
-        * if it were login time out
-        */
+        * iscsi_login_eh can handle the login resched as
+        * if it were login time out
+        */
        actor_delete(&conn->login_timer);
        actor_timer(&conn->login_timer, delay * 1000,
                    iscsi_login_timedout, qtask);
@@ -1129,7 +1129,7 @@ mgmt_ipc_err_e iscsi_host_set_param(int host_no, int 
param, char *value)
                return MGMT_IPC_ERR_TRANS_FAILURE;
        if (__iscsi_host_set_param(t, host_no, param, value, ISCSI_STRING))
                return MGMT_IPC_ERR;
-        return MGMT_IPC_OK;
+       return MGMT_IPC_OK;
 }
 
 #define MAX_SESSION_PARAMS 29
@@ -1409,7 +1409,7 @@ static void iscsi_logout_timedout(void *data)
        struct iscsi_conn_context *conn_context = data;
        struct iscsi_conn *conn = conn_context->conn;
 
-       iscsi_conn_context_put(conn_context); 
+       iscsi_conn_context_put(conn_context);
        /*
         * assume we were in STATE_IN_LOGOUT or there
         * was some nasty error
@@ -1558,7 +1558,7 @@ static void iscsi_recv_async_msg(iscsi_conn_t *conn, 
struct iscsi_hdr *hdr)
 }
 
 static void iscsi_recv_login_rsp(struct iscsi_conn *conn)
-{ 
+{
        struct iscsi_session *session = conn->session;
        iscsi_login_context_t *c = &conn->login_context;
 
diff --git a/usr/initiator.h b/usr/initiator.h
index 8fe2d20..ee5524a 100644
--- a/usr/initiator.h
+++ b/usr/initiator.h
@@ -147,8 +147,8 @@ typedef struct iscsi_conn {
        int type_of_service;
 
        /* used for the IPC of bind and for connect/poll/disconnect by
-         * transports (eg iser) which does these ops from the kernel.
-         * In the case of TCP, it is just the transport_fd casted to u64. */
+        * transports (eg iser) which does these ops from the kernel.
+        * In the case of TCP, it is just the transport_fd casted to u64. */
        uint64_t transport_ep_handle;
 
        /* timeouts */
diff --git a/usr/io.c b/usr/io.c
index 357a8dd..3d78c77 100644
--- a/usr/io.c
+++ b/usr/io.c
@@ -205,7 +205,7 @@ static int get_netdev_from_hwaddress(char *hwaddress, char 
*netdev)
                if (!strcasecmp(tmp_hwaddress, hwaddress)) {
                        log_debug(4, "Matches %s to %s", hwaddress,
                                  n->if_name);
-                       memset(netdev, 0, IFNAMSIZ); 
+                       memset(netdev, 0, IFNAMSIZ);
                        strncpy(netdev, n->if_name, IFNAMSIZ);
                        found = 1;
                        break;
@@ -258,7 +258,7 @@ static int bind_conn_to_iface(iscsi_conn_t *conn, struct 
iface_rec *iface)
            !get_netdev_from_hwaddress(iface->hwaddress, session->netdev)) {
                log_error("Cannot match %s to net/scsi interface.",
                          iface->hwaddress);
-                return -1;
+               return -1;
        } else if (iface_is_bound_by_ipaddr(iface) &&
                   bind_src_by_address(conn->socket_fd, iface->ipaddress)) {
                log_error("Cannot match %s to net/scsi interface.",
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
index 6efb8a9..6364ea6 100644
--- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c
@@ -649,7 +649,7 @@ int get_sessioninfo_by_sysfs_id(struct session_info *info, 
char *session)
                  info->iface.iname);
        return 0;
 }
- 
+
 int sysfs_for_each_session(void *data, int *nr_found, sysfs_session_op_fn *fn)
 {
        struct dirent **namelist;
@@ -972,10 +972,10 @@ struct iscsi_transport *get_transport_by_session(char 
*sys_session)
 {
        uint32_t sid;
 
-        if (sscanf(sys_session, "session%u", &sid) != 1) {
-                log_error("invalid session '%s'.", sys_session);
-                return NULL;
-        }
+       if (sscanf(sys_session, "session%u", &sid) != 1) {
+               log_error("invalid session '%s'.", sys_session);
+               return NULL;
+       }
 
        return get_transport_by_sid(sid);
 }
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
index 433c4e6..aac2d70 100644
--- a/usr/iscsiadm.c
+++ b/usr/iscsiadm.c
@@ -656,7 +656,7 @@ create_node_record(idbm_t *db, char *targetname, int tpgt, 
char *ip, int port,
                        }
                } else if (!strcmp(iface->name, DEFAULT_IFACENAME))
                        /*
-                        * default is a special name and should not be used by
+                        * default is a special name and should not be used by
                         * a real iface
                         */
                        iface_init(&rec->iface);
@@ -1462,10 +1462,10 @@ static int delete_node(struct idbm *db, void *data, 
struct node_rec *rec)
 {
        if (check_for_session_through_iface(rec)) {
                /*
-                * We could log out the session for the user, but if
-                * the session is being used the user may get something
-                * they were not expecting (FS errors and a read only
-                * remount).
+                * We could log out the session for the user, but if
+                * the session is being used the user may get something
+                * they were not expecting (FS errors and a read only
+                * remount).
                 */
                log_error("This command will remove the record [iface: %s, "
                          "target: %s, portal: %s,%d], but a session is "
@@ -1519,7 +1519,7 @@ update_discovery_recs(idbm_t *db, discovery_rec_t *drec,
        struct node_rec *new_rec, *tmp;
 
        INIT_LIST_HEAD(&bound_rec_list);
- 
+
        /* bind ifaces to node recs so we know what we have */
        list_for_each_entry(new_rec, new_rec_list, list) {
                rc = idbm_bind_ifaces_to_node(db, new_rec, ifaces,
@@ -1641,7 +1641,7 @@ do_sendtargets(idbm_t *db, discovery_rec_t *drec, struct 
list_head *ifaces,
                host_no = get_host_no_from_iface(iface, &rc);
                if (rc || host_no == -1) {
                        log_debug(1, "Could not match iface" iface_fmt " to "
-                                 "host.", iface_str(iface)); 
+                                 "host.", iface_str(iface));
                        /* try software iscsi */
                        continue;
                }
@@ -1987,7 +1987,7 @@ static int exec_node_op(idbm_t *db, int op, int do_login, 
int do_logout,
                set_param.name = name;
                set_param.value = value;
 
-               if (for_each_rec(db, rec, &set_param, idbm_node_set_param))     
+               if (for_each_rec(db, rec, &set_param, idbm_node_set_param))
                        rc = -1;
                goto out;
        } else if (op == OP_DELETE) {
diff --git a/usr/isns.c b/usr/isns.c
index 84a1117..4424995 100644
--- a/usr/isns.c
+++ b/usr/isns.c
@@ -160,7 +160,7 @@ static void build_dev_reg_req(struct isns_task *task)
 
        port = htonl(ntohs(port));
 
-        length += isns_tlv_set(&tlv, ISNS_ATTR_ISCSI_NAME, strlen(name), name);
+       length += isns_tlv_set(&tlv, ISNS_ATTR_ISCSI_NAME, strlen(name), name);
        length += isns_tlv_set(&tlv, ISNS_ATTR_ENTITY_IDENTIFIER,
                               strlen(eid), eid);
        length += isns_tlv_set(&tlv, 0, 0, 0);
diff --git a/usr/list.h b/usr/list.h
index bbf3425..ad7a43f 100644
--- a/usr/list.h
+++ b/usr/list.h
@@ -12,8 +12,8 @@
 #endif
 
 #define container_of(ptr, type, member) ({                     \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);   \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
+       const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
+       (type *)( (char *)__mptr - offsetof(type,member) );})
 
 struct list_head {
        struct list_head *next, *prev;
diff --git a/usr/login.c b/usr/login.c
index 7c004cd..1d64826 100644
--- a/usr/login.c
+++ b/usr/login.c
@@ -130,7 +130,7 @@ get_auth_key_type(struct iscsi_acl *auth_client, char 
**data, char *end)
 {
        char *key;
        char *value = NULL;
-        char *value_end = NULL;
+       char *value_end = NULL;
        char *text = *data;
 
        int keytype = AUTH_KEY_TYPE_NONE;
@@ -762,7 +762,7 @@ iscsi_process_login_response(iscsi_session_t *session, int 
cid,
 
 static int
 add_params_normal_session(iscsi_session_t *session, struct iscsi_hdr *pdu,
-                    char *data, int max_data_length)
+                         char *data, int max_data_length)
 {
        char value[AUTH_STR_MAX_LEN];
 
@@ -811,7 +811,7 @@ add_params_transport_specific(iscsi_session_t *session, int 
cid,
        iscsi_conn_t *conn = &session->conn[cid];
 
        if (session->type == ISCSI_SESSION_TYPE_DISCOVERY ||
-           !session->t->template->rdma) {
+           !session->t->template->rdma) {
                sprintf(value, "%d", conn->max_recv_dlength);
                if (!iscsi_add_text(pdu, data, max_data_length,
                                    "MaxRecvDataSegmentLength", value))
@@ -838,7 +838,7 @@ add_params_transport_specific(iscsi_session_t *session, int 
cid,
 
 static int
 check_irrelevant_keys(iscsi_session_t *session, struct iscsi_hdr *pdu,
-                    char *data, int max_data_length)
+                     char *data, int max_data_length)
 {
        /* If you receive irrelevant keys, just check them from the irrelevant
         * keys bitmap and respond with the key=Irrelevant text
diff --git a/usr/scsi.c b/usr/scsi.c
index 14767e2..333ea64 100644
--- a/usr/scsi.c
+++ b/usr/scsi.c
@@ -39,7 +39,7 @@
  *     1 if valid sense data information found, else 0;
  **/
 int scsi_normalize_sense(const uint8_t *sense_buffer, int sb_len,
-                         struct scsi_sense_hdr *sshdr)
+                        struct scsi_sense_hdr *sshdr)
 {
        if (!sense_buffer || !sb_len)
                return 0;
@@ -64,7 +64,7 @@ int scsi_normalize_sense(const uint8_t *sense_buffer, int 
sb_len,
                if (sb_len > 7)
                        sshdr->additional_length = sense_buffer[7];
        } else {
-               /* 
+               /*
                 * fixed format
                 */
                if (sb_len > 2)
diff --git a/usr/sha1.c b/usr/sha1.c
index 8285a5e..a10768e 100644
--- a/usr/sha1.c
+++ b/usr/sha1.c
@@ -36,12 +36,12 @@ static inline uint32_t rol(uint32_t value, uint32_t bits)
 
 /* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
 #define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5); \
-                        w=rol(w,30);
+                       w=rol(w,30);
 #define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5); \
-                        w=rol(w,30);
+                       w=rol(w,30);
 #define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
 #define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5); \
-                        w=rol(w,30);
+                       w=rol(w,30);
 #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
diff --git a/usr/sha1.h b/usr/sha1.h
index af436b3..df360bd 100644
--- a/usr/sha1.h
+++ b/usr/sha1.h
@@ -15,9 +15,9 @@
 #include "types.h"
 
 struct sha1_ctx {
-        uint64_t count;
-        uint32_t state[5];
-        uint8_t buffer[64];
+       uint64_t count;
+       uint32_t state[5];
+       uint8_t buffer[64];
 };
 
 void sha1_init(void *ctx);
-- 
1.5.3.6



--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To post to this group, send email to open-iscsi@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/open-iscsi
-~----------~----~----~----~------~----~------~--~---

Reply via email to