diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 14:59:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 14:59:00 +0000 |
| commit | 1cefc35122bcf1e78162ba0a2d78357ceabf97b0 (patch) | |
| tree | a6978b57768e45ecbbd689911f3e4b47ee507531 /tc/m_pedit.c | |
| parent | Adding debian version 6.8.0-1. (diff) | |
| download | iproute2-1cefc35122bcf1e78162ba0a2d78357ceabf97b0.tar.xz iproute2-1cefc35122bcf1e78162ba0a2d78357ceabf97b0.zip | |
Merging upstream version 6.9.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tc/m_pedit.c')
| -rw-r--r-- | tc/m_pedit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tc/m_pedit.c b/tc/m_pedit.c index 32f0341..5c84a90 100644 --- a/tc/m_pedit.c +++ b/tc/m_pedit.c @@ -620,7 +620,7 @@ static int pedit_keys_ex_addattr(struct m_pedit_sel *sel, struct nlmsghdr *n) return 0; } -static int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, +static int parse_pedit(const struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct nlmsghdr *n) { struct m_pedit_sel sel = {}; @@ -745,7 +745,7 @@ static int print_pedit_location(FILE *f, return 0; } -static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) +static int print_pedit(const struct action_util *au, FILE *f, struct rtattr *arg) { struct tc_pedit_sel *sel; struct rtattr *tb[TCA_PEDIT_MAX + 1]; @@ -771,20 +771,20 @@ static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) sel = RTA_DATA(tb[TCA_PEDIT_PARMS_EX]); if (!tb[TCA_PEDIT_KEYS_EX]) { - fprintf(f, "Netlink error\n"); + fprintf(stderr, "Netlink error\n"); return -1; } keys_ex = calloc(sel->nkeys, sizeof(*keys_ex)); if (!keys_ex) { - fprintf(f, "Out of memory\n"); + fprintf(stderr, "Out of memory\n"); return -1; } err = pedit_keys_ex_getattr(tb[TCA_PEDIT_KEYS_EX], keys_ex, sel->nkeys); if (err) { - fprintf(f, "Netlink error\n"); + fprintf(stderr, "Netlink error\n"); free(keys_ex); return -1; |