diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 22:09:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 23:01:08 -0500 |
| commit | 7267c0947d7e8ae5dff7bafd932c3bc285f43e5c (patch) | |
| tree | 9aa05d6e05ed83e67bf014f6745a3081b8407dc5 /slirp/tftp.c | |
| parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
| download | focaccia-qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.gz focaccia-qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.zip | |
Use glib memory allocation and free functions
qemu_malloc/qemu_free no longer exist after this commit. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/tftp.c')
| -rw-r--r-- | slirp/tftp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slirp/tftp.c b/slirp/tftp.c index 8055ccc17a..b78765f3af 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -37,7 +37,7 @@ static inline void tftp_session_update(struct tftp_session *spt) static void tftp_session_terminate(struct tftp_session *spt) { - qemu_free(spt->filename); + g_free(spt->filename); spt->slirp = NULL; } @@ -54,7 +54,7 @@ static int tftp_session_allocate(Slirp *slirp, struct tftp_t *tp) /* sessions time out after 5 inactive seconds */ if ((int)(curtime - spt->timestamp) > 5000) { - qemu_free(spt->filename); + g_free(spt->filename); goto found; } } @@ -287,7 +287,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp_t *tp, int pktlen) /* prepend tftp_prefix */ prefix_len = strlen(slirp->tftp_prefix); - spt->filename = qemu_malloc(prefix_len + TFTP_FILENAME_MAX + 2); + spt->filename = g_malloc(prefix_len + TFTP_FILENAME_MAX + 2); memcpy(spt->filename, slirp->tftp_prefix, prefix_len); spt->filename[prefix_len] = '/'; |