aboutsummaryrefslogtreecommitdiff
path: root/slirp/tftp.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-06-27 12:41:36 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-07-03 23:59:42 +0200
commite5857062a61de50e4d9249edfff3c222f8aca113 (patch)
tree5ab1c2b4969e6c39b578ce88115987786a290f7b /slirp/tftp.c
parentf7725df38750c1eaebc6665159bb58ec23864c92 (diff)
slirp: Remove superfluous memset() calls from the TFTP code
Commit fad7fb9ccd8013ea03 ("Add IPv6 support to the TFTP code") refactored some common code for preparing the mbuf into a new function called tftp_prep_mbuf_data(). One part of this common code is to do a "memset(m->m_data, 0, m->m_size);" for the related buffer first. However, at two spots, the memset() was not removed from the calling function, so it currently done twice in these code paths. Thus let's delete these superfluous memsets in the calling functions now. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp/tftp.c')
-rw-r--r--slirp/tftp.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/slirp/tftp.c b/slirp/tftp.c
index 12b5ff6e25..367340222d 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -208,8 +208,6 @@ static void tftp_send_error(struct tftp_session *spt,
goto out;
}
- memset(m->m_data, 0, m->m_size);
-
tp = tftp_prep_mbuf_data(spt, m);
tp->tp_op = htons(TFTP_ERROR);
@@ -237,8 +235,6 @@ static void tftp_send_next_block(struct tftp_session *spt,
return;
}
- memset(m->m_data, 0, m->m_size);
-
tp = tftp_prep_mbuf_data(spt, m);
tp->tp_op = htons(TFTP_DATA);