diff options
| author | Orestis Floros <orestisflo@gmail.com> | 2020-05-01 11:10:05 +0200 |
|---|---|---|
| committer | Orestis Floros <orestisflo@gmail.com> | 2020-05-01 11:19:41 +0200 |
| commit | 84ad5c93db9a604fe4fa78324c6af6b1a8f23e5f (patch) | |
| tree | caf157eeb6424cb7726366cd939ebc887fda6a0b /src | |
| parent | aad3cc99c51ac434210d63bd00e397c46a4cb6e7 (diff) | |
travis: update dist, add custom matrix
New matrix for 5 jobs in total.
Updates our checks to bionic & xenial. Trusty could also be
included but it is a bit outdated at this point.
I use bionic to pull a more recent clang-format and use a dedicated job
just to check formatting. An alternative would be to conditionally run
the formatting script only on bionic.
I don't think that there is a better way to expand a `dist` x `compiler`
matrix (except using docker).
Diffstat (limited to 'src')
| -rw-r--r-- | src/print_load.c | 2 | ||||
| -rw-r--r-- | src/print_wireless_info.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/print_load.c b/src/print_load.c index 3ffc576..a2638c0 100644 --- a/src/print_load.c +++ b/src/print_load.c @@ -13,7 +13,7 @@ void print_load(yajl_gen json_gen, char *buffer, const char *format, const char *format_above_threshold, const float max_threshold) { char *outwalk = buffer; -/* Get load */ + /* Get load */ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__DragonFly__) double loadavg[3]; diff --git a/src/print_wireless_info.c b/src/print_wireless_info.c index cfb51b6..ff63c41 100644 --- a/src/print_wireless_info.c +++ b/src/print_wireless_info.c @@ -164,11 +164,11 @@ static int gwi_sta_cb(struct nl_msg *msg, void *data) { struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1]; struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1]; static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = { - [NL80211_STA_INFO_RX_BITRATE] = {.type = NLA_NESTED}, + [NL80211_STA_INFO_RX_BITRATE] = {.type = NLA_NESTED}, }; static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { - [NL80211_RATE_INFO_BITRATE] = {.type = NLA_U16}, + [NL80211_RATE_INFO_BITRATE] = {.type = NLA_U16}, }; if (nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0) @@ -212,12 +212,12 @@ static int gwi_scan_cb(struct nl_msg *msg, void *data) { struct nlattr *tb[NL80211_ATTR_MAX + 1]; struct nlattr *bss[NL80211_BSS_MAX + 1]; struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = { - [NL80211_BSS_FREQUENCY] = {.type = NLA_U32}, - [NL80211_BSS_BSSID] = {.type = NLA_UNSPEC}, - [NL80211_BSS_INFORMATION_ELEMENTS] = {.type = NLA_UNSPEC}, - [NL80211_BSS_SIGNAL_MBM] = {.type = NLA_U32}, - [NL80211_BSS_SIGNAL_UNSPEC] = {.type = NLA_U8}, - [NL80211_BSS_STATUS] = {.type = NLA_U32}, + [NL80211_BSS_FREQUENCY] = {.type = NLA_U32}, + [NL80211_BSS_BSSID] = {.type = NLA_UNSPEC}, + [NL80211_BSS_INFORMATION_ELEMENTS] = {.type = NLA_UNSPEC}, + [NL80211_BSS_SIGNAL_MBM] = {.type = NLA_U32}, + [NL80211_BSS_SIGNAL_UNSPEC] = {.type = NLA_U8}, + [NL80211_BSS_STATUS] = {.type = NLA_U32}, }; if (nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0) |