[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] slirp: change tftp to use stdio APIs vs open/re
From: |
Mark Pizzolato |
Subject: |
[Qemu-devel] [PATCH 3/5] slirp: change tftp to use stdio APIs vs open/read/close |
Date: |
Wed, 21 Oct 2015 16:15:14 -0700 |
Direct use of open/read/write/close on files produces build warnings on
Windows when compiling with Visual Studio
Signed-off-by: Mark Pizzolato <address@hidden>
---
slirp/tftp.c | 18 +++++++++---------
slirp/tftp.h | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/slirp/tftp.c b/slirp/tftp.c
index a329fb2..bb8e8eb 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -37,9 +37,9 @@ static inline void tftp_session_update(struct tftp_session
*spt)
static void tftp_session_terminate(struct tftp_session *spt)
{
- if (spt->fd >= 0) {
- close(spt->fd);
- spt->fd = -1;
+ if (spt->f != NULL) {
+ fclose(spt->f);
+ spt->f = NULL;
}
g_free(spt->filename);
spt->slirp = NULL;
@@ -68,7 +68,7 @@ static int tftp_session_allocate(Slirp *slirp, struct tftp_t
*tp)
found:
memset(spt, 0, sizeof(*spt));
memcpy(&spt->client_ip, &tp->ip.ip_src, sizeof(spt->client_ip));
- spt->fd = -1;
+ spt->f = NULL;
spt->client_port = tp->udp.uh_sport;
spt->slirp = slirp;
@@ -102,18 +102,18 @@ static int tftp_read_data(struct tftp_session *spt,
uint32_t block_nr,
{
int bytes_read = 0;
- if (spt->fd < 0) {
- spt->fd = open(spt->filename, O_RDONLY | O_BINARY);
+ if (spt->f == NULL) {
+ spt->f = fopen(spt->filename, "rb");
}
- if (spt->fd < 0) {
+ if (spt->f == NULL) {
return -1;
}
if (len) {
- lseek(spt->fd, block_nr * 512, SEEK_SET);
+ fseek(spt->f, block_nr * 512, SEEK_SET);
- bytes_read = read(spt->fd, buf, len);
+ bytes_read = fread(buf, 1, len, spt->f);
}
return bytes_read;
diff --git a/slirp/tftp.h b/slirp/tftp.h
index e1cc24b..a3a70a6 100644
--- a/slirp/tftp.h
+++ b/slirp/tftp.h
@@ -35,7 +35,7 @@ struct tftp_t {
struct tftp_session {
Slirp *slirp;
char *filename;
- int fd;
+ FILE *f;
struct in_addr client_ip;
uint16_t client_port;
--
1.9.5.msysgit.0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH 3/5] slirp: change tftp to use stdio APIs vs open/read/close,
Mark Pizzolato <=