From: Jeremy Sowden <jeremy@azazel.net>
To: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [PATCH nft v4 2/6] evaluate: correct variable name.
Date: Mon, 3 Feb 2020 11:20:19 +0000 [thread overview]
Message-ID: <20200203112023.646840-3-jeremy@azazel.net> (raw)
In-Reply-To: <20200203112023.646840-1-jeremy@azazel.net>
Rename the `lshift` variable used to store an right-shift expression to
`rshift`.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
src/evaluate.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/evaluate.c b/src/evaluate.c
index 09dd493f0757..966582e44a7d 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -450,7 +450,7 @@ static uint8_t expr_offset_shift(const struct expr *expr, unsigned int offset,
static void expr_evaluate_bits(struct eval_ctx *ctx, struct expr **exprp)
{
- struct expr *expr = *exprp, *and, *mask, *lshift, *off;
+ struct expr *expr = *exprp, *and, *mask, *rshift, *off;
unsigned masklen, len = expr->len, extra_len = 0;
uint8_t shift;
mpz_t bitmask;
@@ -490,12 +490,12 @@ static void expr_evaluate_bits(struct eval_ctx *ctx, struct expr **exprp)
BYTEORDER_BIG_ENDIAN,
sizeof(shift), &shift);
- lshift = binop_expr_alloc(&expr->location, OP_RSHIFT, and, off);
- lshift->dtype = expr->dtype;
- lshift->byteorder = expr->byteorder;
- lshift->len = masklen;
+ rshift = binop_expr_alloc(&expr->location, OP_RSHIFT, and, off);
+ rshift->dtype = expr->dtype;
+ rshift->byteorder = expr->byteorder;
+ rshift->len = masklen;
- *exprp = lshift;
+ *exprp = rshift;
} else
*exprp = and;
--
2.24.1
next prev parent reply other threads:[~2020-02-03 11:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 11:20 [PATCH nft v4 0/6] Remaining bitwise-shift-related changes Jeremy Sowden
2020-02-03 11:20 ` [PATCH nft v4 1/6] parser: add parenthesized statement expressions Jeremy Sowden
2020-02-03 11:20 ` Jeremy Sowden [this message]
2020-02-03 11:20 ` [PATCH nft v4 3/6] evaluate: change shift byte-order to host-endian Jeremy Sowden
2020-02-03 11:20 ` [PATCH nft v4 4/6] tests: shell: add bit-shift tests Jeremy Sowden
2020-02-03 11:20 ` [PATCH nft v4 5/6] tests: py: add missing JSON output Jeremy Sowden
2020-02-03 11:20 ` [PATCH nft v4 6/6] tests: py: add bit-shift tests Jeremy Sowden
2020-02-07 16:09 ` [PATCH nft v4 0/6] Remaining bitwise-shift-related changes Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200203112023.646840-3-jeremy@azazel.net \
--to=jeremy@azazel.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).