summaryrefslogtreecommitdiffstats
path: root/contrib/ofed/management
diff options
context:
space:
mode:
authorjeff <jeff@FreeBSD.org>2013-08-09 03:29:46 +0000
committerjeff <jeff@FreeBSD.org>2013-08-09 03:29:46 +0000
commit30089e4bdffb1ca1274346bb34fccd5b45d675d0 (patch)
tree751e6b67e37c956694ba7f8e95514c2f9e5852fa /contrib/ofed/management
parent5f141f7f1fc16a09ae4b1cc9defb6db495128161 (diff)
downloadFreeBSD-src-30089e4bdffb1ca1274346bb34fccd5b45d675d0.zip
FreeBSD-src-30089e4bdffb1ca1274346bb34fccd5b45d675d0.tar.gz
- Fix compile errors from the clang conversion
- Grab AF_SDP_INET from sys/socket.h Submitted by: Garrett Cooper Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'contrib/ofed/management')
-rw-r--r--contrib/ofed/management/infiniband-diags/src/sminfo.c8
-rw-r--r--contrib/ofed/management/opensm/opensm/osm_console.c5
-rw-r--r--contrib/ofed/management/opensm/opensm/osm_subnet.c4
3 files changed, 10 insertions, 7 deletions
diff --git a/contrib/ofed/management/infiniband-diags/src/sminfo.c b/contrib/ofed/management/infiniband-diags/src/sminfo.c
index c811057..a8144ac 100644
--- a/contrib/ofed/management/infiniband-diags/src/sminfo.c
+++ b/contrib/ofed/management/infiniband-diags/src/sminfo.c
@@ -72,10 +72,10 @@ enum {
};
char *statestr[] = {
- [SMINFO_NOTACT] "SMINFO_NOTACT",
- [SMINFO_DISCOVER] "SMINFO_DISCOVER",
- [SMINFO_STANDBY] "SMINFO_STANDBY",
- [SMINFO_MASTER] "SMINFO_MASTER",
+ [SMINFO_NOTACT] = "SMINFO_NOTACT",
+ [SMINFO_DISCOVER] = "SMINFO_DISCOVER",
+ [SMINFO_STANDBY] = "SMINFO_STANDBY",
+ [SMINFO_MASTER] = "SMINFO_MASTER",
};
#define STATESTR(s) (((unsigned)(s)) < SMINFO_STATE_LAST ? statestr[s] : "???")
diff --git a/contrib/ofed/management/opensm/opensm/osm_console.c b/contrib/ofed/management/opensm/opensm/osm_console.c
index c6e8e59..5c494a8 100644
--- a/contrib/ofed/management/opensm/opensm/osm_console.c
+++ b/contrib/ofed/management/opensm/opensm/osm_console.c
@@ -67,7 +67,10 @@ static struct {
time_t previous;
void (*loop_function) (osm_opensm_t * p_osm, FILE * out);
} loop_command = {
-on: 0, delay_s: 2, loop_function:NULL};
+ .on = 0,
+ .delay_s = 2,
+ .loop_function = NULL,
+};
static const struct command console_cmds[];
diff --git a/contrib/ofed/management/opensm/opensm/osm_subnet.c b/contrib/ofed/management/opensm/opensm/osm_subnet.c
index c41962d..558027c 100644
--- a/contrib/ofed/management/opensm/opensm/osm_subnet.c
+++ b/contrib/ofed/management/opensm/opensm/osm_subnet.c
@@ -482,7 +482,7 @@ static void log_report(const char *fmt, ...)
va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args);
- printf(buf);
+ printf("%s", buf);
cl_log_event("OpenSM", CL_LOG_INFO, buf, NULL, 0);
}
@@ -500,7 +500,7 @@ static void log_config_value(char *name, const char *fmt, ...)
n = sizeof(buf);
snprintf(buf + n, sizeof(buf) - n, "\n");
va_end(args);
- printf(buf);
+ printf("%s", buf);
cl_log_event("OpenSM", CL_LOG_INFO, buf, NULL, 0);
}
OpenPOWER on IntegriCloud