[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] slirp: reformat m_inc routine
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 5/5] slirp: reformat m_inc routine |
Date: |
Fri, 8 Jun 2018 09:13:16 +0300 |
From: Prasad J Pandit <address@hidden>
Coding style changes to the m_inc routine and minor refactoring.
Reported-by: ZDI Disclosures <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/mbuf.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/slirp/mbuf.c b/slirp/mbuf.c
index 18cbf759a7..0c189e1a7b 100644
--- a/slirp/mbuf.c
+++ b/slirp/mbuf.c
@@ -151,27 +151,25 @@ m_cat(struct mbuf *m, struct mbuf *n)
void
m_inc(struct mbuf *m, int size)
{
- int datasize;
+ int datasize;
- /* some compiles throw up on gotos. This one we can fake. */
- if(m->m_size>size) return;
+ /* some compilers throw up on gotos. This one we can fake. */
+ if (m->m_size > size) {
+ return;
+ }
- if (m->m_flags & M_EXT) {
- datasize = m->m_data - m->m_ext;
- m->m_ext = g_realloc(m->m_ext, size + datasize);
- m->m_data = m->m_ext + datasize;
- } else {
- char *dat;
- datasize = m->m_data - m->m_dat;
- dat = g_malloc(size + datasize);
- memcpy(dat, m->m_dat, m->m_size);
-
- m->m_ext = dat;
- m->m_data = m->m_ext + datasize;
- m->m_flags |= M_EXT;
- }
+ if (m->m_flags & M_EXT) {
+ datasize = m->m_data - m->m_ext;
+ m->m_ext = g_realloc(m->m_ext, size + datasize);
+ } else {
+ datasize = m->m_data - m->m_dat;
+ m->m_ext = g_malloc(size + datasize);
+ memcpy(m->m_ext, m->m_dat, m->m_size);
+ m->m_flags |= M_EXT;
+ }
- m->m_size = size + datasize;
+ m->m_data = m->m_ext + datasize;
+ m->m_size = size + datasize;
}
--
2.17.1
- [Qemu-devel] [PULL 0/5] slirp updates, Samuel Thibault, 2018/06/08
- [Qemu-devel] [PULL 2/5] slirp: Add Samuel Thibault's staging tree for slirp, Samuel Thibault, 2018/06/08
- [Qemu-devel] [PULL 3/5] slirp: fix domainname version availability, Samuel Thibault, 2018/06/08
- [Qemu-devel] [PULL 4/5] slirp: correct size computation while concatenating mbuf, Samuel Thibault, 2018/06/08
- [Qemu-devel] [PULL 5/5] slirp: reformat m_inc routine,
Samuel Thibault <=
- [Qemu-devel] [PULL 1/5] slirp: Fix spurious error report when sending directly, Samuel Thibault, 2018/06/08
- Re: [Qemu-devel] [PULL 0/5] slirp updates, Peter Maydell, 2018/06/08
- Re: [Qemu-devel] [PULL 0/5] slirp updates, no-reply, 2018/06/08