Commit c22098c7 authored by Prasad J Pandit's avatar Prasad J Pandit Committed by Samuel Thibault
Browse files

slirp: reformat m_inc routine 



Coding style changes to the m_inc routine and minor refactoring.

Reported-by: default avatarZDI Disclosures <zdi-disclosures@trendmicro.com>
Signed-off-by: default avatarPrasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent 864036e2

slirp/mbuf.c

+16 −18
Original line number Diff line number Diff line
@@ -153,24 +153,22 @@ m_inc(struct mbuf *m, int size) 
{

    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_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;

}