[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 41/64] slirp: replace ARRAY_SIZE with G_N_ELEMENTS
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 41/64] slirp: replace ARRAY_SIZE with G_N_ELEMENTS |
Date: |
Wed, 19 Dec 2018 00:04:19 +0100 |
From: Marc-André Lureau <address@hidden>
Do not require QEMU macro.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <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 735b57aa55..a9ba1480db 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -359,7 +359,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];
@@ -403,7 +403,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.2
- [Qemu-devel] [PULL 33/64] slirp: remove unused global slirp_instance, (continued)
- [Qemu-devel] [PULL 33/64] slirp: remove unused global slirp_instance, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 42/64] net: do not depend on slirp internals, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 34/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 27/64] slirp: remove HAVE_SYS_FILIO_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 25/64] slirp: remove unused HAVE_SYS_SELECT_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 22/64] slirp: remove unused HAVE_SYS_STROPTS_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 38/64] slirp: remove unused sbflush(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 31/64] slirp: replace SIZEOF_CHAR_P with glib equivalent, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 43/64] glib-compat: add g_spawn_async_with_fds() fallback, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 28/64] slirp: remove unused DECLARE_IOVEC, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 41/64] slirp: replace ARRAY_SIZE with G_N_ELEMENTS,
Samuel Thibault <=
- [Qemu-devel] [PULL 45/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 35/64] slirp: improve a bit the debug macros, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 15/64] slirp: use a callback structure to interface with qemu, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 44/64] slirp: simplify fork_exec(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 46/64] slirp: Enable fork_exec support on Windows, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 40/64] slirp: remove dead TCP_ACK_HACK code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 39/64] slirp: NULL is defined by stddef.h, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 48/64] slirp: rename exec_list, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 37/64] slirp: remove #if notdef dead code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 32/64] slirp: replace compile time DO_KEEPALIVE, Samuel Thibault, 2018/12/18