From 00a854287778c852191df9f9815c5d601daa5ae1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 20 Jun 2023 11:11:06 -0600 Subject: Use ARRAY_SIZE in ax-general.c This changes a couple of spots in ax-general.c to use ARRAY_SIZE. While making this change, I noticed that one of the bounds checks was incorrect. Reviewed-by: John Baldwin --- gdb/ax-general.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gdb/ax-general.c b/gdb/ax-general.c index 4ace2b4..3c724a0 100644 --- a/gdb/ax-general.c +++ b/gdb/ax-general.c @@ -353,8 +353,7 @@ ax_print (struct ui_file *f, struct agent_expr *x) { enum agent_op op = (enum agent_op) x->buf[i]; - if (op >= (sizeof (aop_map) / sizeof (aop_map[0])) - || !aop_map[op].name) + if (op >= ARRAY_SIZE (aop_map) || aop_map[op].name == nullptr) { gdb_printf (f, _("%3d \n"), i, op); i++; @@ -454,7 +453,7 @@ ax_reqs (struct agent_expr *ax) for (i = 0; i < ax->buf.size (); i += 1 + op->op_size) { - if (ax->buf[i] > (sizeof (aop_map) / sizeof (aop_map[0]))) + if (ax->buf[i] >= ARRAY_SIZE (aop_map)) { ax->flaw = agent_flaw_bad_instruction; return; -- cgit v1.1