Skip to content

Commit

Permalink
Patch a bunch of compile bugs reported by Fatih USTA
Browse files Browse the repository at this point in the history
  • Loading branch information
ydahhrk committed Jul 8, 2020
1 parent fc1a687 commit bdab961
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -34,7 +34,7 @@ AC_SEARCH_LIBS([pthread_create], [pthread])
AC_CHECK_LIB([argp], [argp_parse])

# Checks for dependencies.
PKG_CHECK_MODULES(LIBNLGENL3, libnl-genl-3.0 >= 3.1)
PKG_CHECK_MODULES(LIBNLGENL3, libnl-genl-3.0 >= 3.2.22)
PKG_CHECK_MODULES(XTABLES, xtables)

# Bash autocompletion option (https://www.swansontec.com/bash-completion.html):
Expand Down
2 changes: 0 additions & 2 deletions src/mod/common/db/pool4/empty.c
Expand Up @@ -30,8 +30,6 @@ bool pool4empty_contains(struct net *ns, const struct ipv4_transport_addr *addr)
{
if (addr->l4 < DEFAULT_POOL4_MIN_PORT)
return false;
if (DEFAULT_POOL4_MAX_PORT < addr->l4)
return false;

return contains_addr(ns, &addr->l3);
}
Expand Down
2 changes: 1 addition & 1 deletion src/usr/nl/attribute.c
Expand Up @@ -65,7 +65,7 @@ struct jool_result jnla_parse_nested(struct nlattr *tb[], int maxtype,

/* Wrapper for nla_validate() for lists */
struct jool_result jnla_validate_list(struct nlattr *head, int len,
char const *what, struct nla_policy const *policy)
char const *what, struct nla_policy *policy)
{
struct nlattr *attr;
int rem;
Expand Down
2 changes: 1 addition & 1 deletion src/usr/nl/attribute.h
Expand Up @@ -20,7 +20,7 @@ struct jool_result jnla_parse_msg(struct nl_msg *msg, struct nlattr *tb[],
struct jool_result jnla_parse_nested(struct nlattr *result[], int maxtype,
struct nlattr *root, struct nla_policy *policy);
struct jool_result jnla_validate_list(struct nlattr *head, int len,
char const *what, struct nla_policy const *policy);
char const *what, struct nla_policy *policy);

struct nlattr *jnla_nest_start(struct nl_msg *msg, int attrtype);

Expand Down

0 comments on commit bdab961

Please sign in to comment.