diff options
| author | Jim Ramsay <jim_ramsay@dell.com> | 2011-07-20 09:06:48 -0400 |
|---|---|---|
| committer | Mike Christie <michaelc@cs.wisc.edu> | 2011-08-02 00:04:37 -0500 |
| commit | fe882380e34391c1873d8a3215d43d4b7f2edbb3 (patch) | |
| tree | 678c35a0617bc1cd064507bc6bafc23c128118c3 /utils/open-isns | |
| parent | 626a1220d5ade8b08dc5d4ece00900dc0924f659 (diff) | |
| download | open-iscsi-fe882380e34391c1873d8a3215d43d4b7f2edbb3.tar.gz | |
open-isns: Fix warnings reported by gcc-4.5.2
Unused symbols and type mis-matches.
Signed-off-by: Jim Ramsay <jim_ramsay@dell.com>
Diffstat (limited to 'utils/open-isns')
| -rw-r--r-- | utils/open-isns/client.c | 2 | ||||
| -rw-r--r-- | utils/open-isns/db-file.c | 4 | ||||
| -rw-r--r-- | utils/open-isns/objects.h | 1 | ||||
| -rw-r--r-- | utils/open-isns/socket.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/utils/open-isns/client.c b/utils/open-isns/client.c index 44e07b8..c470048 100644 --- a/utils/open-isns/client.c +++ b/utils/open-isns/client.c @@ -123,8 +123,10 @@ static isns_security_t * __create_security_context(const char *name, const char *auth_key, const char *server_key) { +#ifdef WITH_SECURITY isns_security_t *ctx; isns_principal_t *princ; +#endif /* WITH_SECURITY */ if (!isns_config.ic_security) return NULL; diff --git a/utils/open-isns/db-file.c b/utils/open-isns/db-file.c index 8adee06..98c08db 100644 --- a/utils/open-isns/db-file.c +++ b/utils/open-isns/db-file.c @@ -310,7 +310,7 @@ __dbe_file_load_object(const char *filename, const char *basename, /* Stash away the parent's index; we resolve them later on * once we've loaded all objects */ - obj->ie_container = (isns_object_t *) ntohl(info.db_parent); + obj->ie_container_idx = ntohl(info.db_parent); isns_object_list_append(result, obj); @@ -493,7 +493,7 @@ isns_dbe_file_reload(isns_db_t *db) /* Resolve parent/child relationship for all nodes */ for (i = 0; i < db->id_objects->iol_count; ++i) { isns_object_t *obj = db->id_objects->iol_data[i]; - uint32_t index = (uint32_t) obj->ie_container; + uint32_t index = obj->ie_container_idx; isns_object_t *parent; if (index == 0) diff --git a/utils/open-isns/objects.h b/utils/open-isns/objects.h index 93ce208..8cc40c6 100644 --- a/utils/open-isns/objects.h +++ b/utils/open-isns/objects.h @@ -83,6 +83,7 @@ struct isns_object { isns_attr_list_t ie_attrs; isns_object_t * ie_container; + uint32_t ie_container_idx; isns_object_template_t *ie_template; isns_relation_t * ie_relation; diff --git a/utils/open-isns/socket.c b/utils/open-isns/socket.c index 7a5dfd4..47481c6 100644 --- a/utils/open-isns/socket.c +++ b/utils/open-isns/socket.c @@ -562,7 +562,7 @@ void isns_net_stream_accept(isns_socket_t *sock) { isns_socket_t *child; - size_t optlen; + socklen_t optlen; int fd, passcred = 0; fd = accept(sock->is_desc, NULL, NULL); |