[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 37/41] slirp: replace ARRAY_SIZE with G_N_EL
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 37/41] slirp: replace ARRAY_SIZE with G_N_ELEMENTS |
Date: |
Wed, 14 Nov 2018 16:36:39 +0400 |
Do not require QEMU macro.
Signed-off-by: Marc-André Lureau <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;
}
--
2.19.1.708.g4ede3d42df
- Re: [Qemu-devel] [PATCH for-3.2 33/41] slirp: replace qemu_notify_event() with a callback, (continued)
- [Qemu-devel] [PATCH for-3.2 34/41] slirp: remove #if notdef dead code, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 35/41] slirp: NULL is defined by glib (at least), Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 36/41] slirp: remove dead TCP_ACK_HACK code, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 37/41] slirp: replace ARRAY_SIZE with G_N_ELEMENTS,
Marc-André Lureau <=
- [Qemu-devel] [PATCH for-3.2 38/41] net: do not depend on slirp internals, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 39/41] slirp: move QEMU state saving to a separate unit, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 41/41] build-sys: add a basic meson build, Marc-André Lureau, 2018/11/14
- [Qemu-devel] [PATCH for-3.2 40/41] slirp: replace remaining QEMU dependency, Marc-André Lureau, 2018/11/14