summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Duncan <leeman.duncan@gmail.com>2018-09-27 09:54:44 -0700
committerGitHub <noreply@github.com>2018-09-27 09:54:44 -0700
commit6657b77f6f718edb2468f91378952b67ece44223 (patch)
tree2262953742466b5d57016c69322954a6c3ecc17a
parentaea60e4b34d826bd92984042db640492d938ea06 (diff)
parent6e5e0611d1aee56c9623de345666545ff8f28fb3 (diff)
downloadopen-iscsi-6657b77f6f718edb2468f91378952b67ece44223.tar.gz
Merge pull request #132 from gonzoleeman/small-cleanups
Small cleanups x 3
-rw-r--r--usr/initiator_common.c2
-rw-r--r--usr/iscsid_req.c1
-rw-r--r--utils/fwparam_ibft/fwparam_ppc.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/usr/initiator_common.c b/usr/initiator_common.c
index d00bd9e..790f13d 100644
--- a/usr/initiator_common.c
+++ b/usr/initiator_common.c
@@ -342,7 +342,7 @@ int iscsi_session_set_neg_params(struct iscsi_conn *conn)
{
struct iscsi_session *session = conn->session;
int i, rc;
- uint32_t one = 1, zero = 0;
+ uint32_t zero = 0;
struct connparam {
int param;
int type;
diff --git a/usr/iscsid_req.c b/usr/iscsid_req.c
index d18b14d..b6940db 100644
--- a/usr/iscsid_req.c
+++ b/usr/iscsid_req.c
@@ -18,6 +18,7 @@
*
* See the file COPYING included with this distribution for more details.
*/
+#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/utils/fwparam_ibft/fwparam_ppc.c
index 391faa2..71fa98d 100644
--- a/utils/fwparam_ibft/fwparam_ppc.c
+++ b/utils/fwparam_ibft/fwparam_ppc.c
@@ -319,9 +319,9 @@ static int find_nics(const char *fpath, const struct stat *sb, int tflag,
return 0;
}
-int nic_cmp(const char **a, const char **b)
+static int nic_cmp(const void *a, const void *b)
{
- return strcmp(*a, *b);
+ return strcmp(a, b);
}
static int find_initiator(const char *fpath, const struct stat *sb, int tflag,