* [Qemu-devel] [PATCH] slirp: Remove unused return value of tftp_send_next_block
@ 2012-09-14 17:35 Jan Kiszka
2012-09-14 20:09 ` Hervé Poussineau
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2012-09-14 17:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Hervé Poussineau, Aurelien Jarno
No caller actually makes use of this value, so let's simplify the code.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Applies on top of http://thread.gmane.org/gmane.comp.emulators.qemu/169909
slirp/tftp.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/slirp/tftp.c b/slirp/tftp.c
index c6a5df2..cf7e3b8 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -197,8 +197,8 @@ out:
tftp_session_terminate(spt);
}
-static int tftp_send_next_block(struct tftp_session *spt,
- struct tftp_t *recv_tp)
+static void tftp_send_next_block(struct tftp_session *spt,
+ struct tftp_t *recv_tp)
{
struct sockaddr_in saddr, daddr;
struct mbuf *m;
@@ -208,7 +208,7 @@ static int tftp_send_next_block(struct tftp_session *spt,
m = m_get(spt->slirp);
if (!m) {
- return -1;
+ return;
}
memset(m->m_data, 0, m->m_size);
@@ -235,7 +235,7 @@ static int tftp_send_next_block(struct tftp_session *spt,
tftp_send_error(spt, 1, "File not found", tp);
- return -1;
+ return;
}
m->m_len = sizeof(struct tftp_t) - (512 - nobytes) -
@@ -251,7 +251,6 @@ static int tftp_send_next_block(struct tftp_session *spt,
}
spt->block_nr++;
- return 0;
}
static void tftp_handle_rrq(Slirp *slirp, struct tftp_t *tp, int pktlen)
@@ -383,10 +382,7 @@ static void tftp_handle_ack(Slirp *slirp, struct tftp_t *tp, int pktlen)
return;
}
- if (tftp_send_next_block(&slirp->tftp_sessions[s],
- tp) < 0) {
- return;
- }
+ tftp_send_next_block(&slirp->tftp_sessions[s], tp);
}
static void tftp_handle_error(Slirp *slirp, struct tftp_t *tp, int pktlen)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] slirp: Remove unused return value of tftp_send_next_block
2012-09-14 17:35 [Qemu-devel] [PATCH] slirp: Remove unused return value of tftp_send_next_block Jan Kiszka
@ 2012-09-14 20:09 ` Hervé Poussineau
0 siblings, 0 replies; 2+ messages in thread
From: Hervé Poussineau @ 2012-09-14 20:09 UTC (permalink / raw)
To: Jan Kiszka; +Cc: qemu-devel, Aurelien Jarno
Jan Kiszka a écrit :
> No caller actually makes use of this value, so let's simplify the code.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>
> Applies on top of http://thread.gmane.org/gmane.comp.emulators.qemu/169909
>
> slirp/tftp.c | 14 +++++---------
> 1 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/slirp/tftp.c b/slirp/tftp.c
> index c6a5df2..cf7e3b8 100644
> --- a/slirp/tftp.c
> +++ b/slirp/tftp.c
> @@ -197,8 +197,8 @@ out:
> tftp_session_terminate(spt);
> }
>
> -static int tftp_send_next_block(struct tftp_session *spt,
> - struct tftp_t *recv_tp)
> +static void tftp_send_next_block(struct tftp_session *spt,
> + struct tftp_t *recv_tp)
> {
> struct sockaddr_in saddr, daddr;
> struct mbuf *m;
> @@ -208,7 +208,7 @@ static int tftp_send_next_block(struct tftp_session *spt,
> m = m_get(spt->slirp);
>
> if (!m) {
> - return -1;
> + return;
> }
>
> memset(m->m_data, 0, m->m_size);
> @@ -235,7 +235,7 @@ static int tftp_send_next_block(struct tftp_session *spt,
>
> tftp_send_error(spt, 1, "File not found", tp);
>
> - return -1;
> + return;
> }
>
> m->m_len = sizeof(struct tftp_t) - (512 - nobytes) -
> @@ -251,7 +251,6 @@ static int tftp_send_next_block(struct tftp_session *spt,
> }
>
> spt->block_nr++;
> - return 0;
> }
>
> static void tftp_handle_rrq(Slirp *slirp, struct tftp_t *tp, int pktlen)
> @@ -383,10 +382,7 @@ static void tftp_handle_ack(Slirp *slirp, struct tftp_t *tp, int pktlen)
> return;
> }
>
> - if (tftp_send_next_block(&slirp->tftp_sessions[s],
> - tp) < 0) {
> - return;
> - }
> + tftp_send_next_block(&slirp->tftp_sessions[s], tp);
> }
>
> static void tftp_handle_error(Slirp *slirp, struct tftp_t *tp, int pktlen)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-14 20:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 17:35 [Qemu-devel] [PATCH] slirp: Remove unused return value of tftp_send_next_block Jan Kiszka
2012-09-14 20:09 ` Hervé Poussineau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).