Re: [Qemu-devel] [PATCH for-3.2 37/41] slirp: replace ARRAY_SIZE with G_N_ELEMENTS

[Philippe Mathieu-Daudé]

On 14/11/18 13:36, Marc-André Lureau wrote:
> Do not require QEMU macro.
>
> Signed-off-by: Marc-André Lureau <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>   slirp/ncsi.c | 2 +-
>   slirp/tftp.c | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/slirp/ncsi.c b/slirp/ncsi.c
> index 10decfb5ef..8594382270 100644
> --- a/slirp/ncsi.c
> +++ b/slirp/ncsi.c
> @@ -128,7 +128,7 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int 
> pkt_len)
>       memset(reh->h_source, 0xff, ETH_ALEN);
>       reh->h_proto = htons(ETH_P_NCSI);
>   
> -    for (i = 0; i < ARRAY_SIZE(ncsi_rsp_handlers); i++) {
> +    for (i = 0; i < G_N_ELEMENTS(ncsi_rsp_handlers); i++) {
>           if (ncsi_rsp_handlers[i].type == nh->type + 0x80) {
>               handler = &ncsi_rsp_handlers[i];
>               break;
> diff --git a/slirp/tftp.c b/slirp/tftp.c
> index dddb614b8a..ef8d0352b4 100644
> --- a/slirp/tftp.c
> +++ b/slirp/tftp.c
> @@ -360,7 +360,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct 
> sockaddr_storage *srcsas,
>         return;
>     }
>   
> -  while (k < pktlen && nb_options < ARRAY_SIZE(option_name)) {
> +  while (k < pktlen && nb_options < G_N_ELEMENTS(option_name)) {
>         const char *key, *value;
>   
>         key = &tp->x.tp_buf[k];
> @@ -404,7 +404,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct 
> sockaddr_storage *srcsas,
>     }
>   
>     if (nb_options > 0) {
> -      assert(nb_options <= ARRAY_SIZE(option_name));
> +      assert(nb_options <= G_N_ELEMENTS(option_name));
>         tftp_send_oack(spt, option_name, option_value, nb_options, tp);
>         return;
>     }