From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQVnQ-0006Aa-7p for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:36:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQVnM-0001fK-4S for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:36:04 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41974 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fQVnL-0001fA-Vr for qemu-devel@nongnu.org; Wed, 06 Jun 2018 06:36:00 -0400 From: P J P Date: Wed, 6 Jun 2018 16:05:49 +0530 Message-Id: <20180606103549.12031-3-ppandit@redhat.com> In-Reply-To: <20180606103549.12031-1-ppandit@redhat.com> References: <20180606103549.12031-1-ppandit@redhat.com> Subject: [Qemu-devel] [PATCH v1 2/2] slirp: reformat m_cat routine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Qemu Developers Cc: Samuel Thibault , Jan Kiszka , Prasad J Pandit From: Prasad J Pandit Coding style changes to the m_cat routine and minor refactoring. Signed-off-by: Prasad J Pandit --- slirp/mbuf.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/slirp/mbuf.c b/slirp/mbuf.c index 6650981fc7..e012cd4760 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -152,32 +152,28 @@ 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 compiles 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; - } - - m->m_size = size + datasize; + 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_data = m->m_ext + datasize; + m->m_size = size + datasize; } - void m_adj(struct mbuf *m, int len) { -- 2.17.1