aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-03-03 09:25:59 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-03-03 09:25:59 +0000
commite2f7030202bac42e7f08309ba71e370fba714623 (patch)
tree2875013012b11f0970b58ae184e929cba75fb63c
parent533519cc9ccda476ba99cd3e97f82e75a4847a7f (diff)
rename struct FILE to FILEPROTO, to prevent it from causing trouble with
the plain old FILE typedef.
-rw-r--r--lib/file.c5
-rw-r--r--lib/urldata.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/file.c b/lib/file.c
index dcf59d06e..e10fa8108 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -95,18 +95,17 @@
CURLcode Curl_file_connect(struct connectdata *conn)
{
char *real_path = curl_unescape(conn->path, 0);
- struct FILE *file;
+ struct FILEPROTO *file;
int fd;
#if defined(WIN32) || defined(__EMX__)
int i;
char *actual_path;
#endif
- file = (struct FILE *)malloc(sizeof(struct FILE));
+ file = (struct FILEPROTO *)calloc(sizeof(struct FILEPROTO), 1);
if(!file)
return CURLE_OUT_OF_MEMORY;
- memset(file, 0, sizeof(struct FILE));
conn->proto.file = file;
#if defined(WIN32) || defined(__EMX__)
diff --git a/lib/urldata.h b/lib/urldata.h
index 821a0c37e..85d9fca2e 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -267,7 +267,7 @@ struct FTP {
/****************************************************************************
* FILE unique setup
***************************************************************************/
-struct FILE {
+struct FILEPROTO {
int fd; /* open file descriptor to read from! */
};
@@ -539,7 +539,7 @@ struct connectdata {
struct HTTP *gopher; /* alias, just for the sake of being more readable */
struct HTTP *https; /* alias, just for the sake of being more readable */
struct FTP *ftp;
- struct FILE *file;
+ struct FILEPROTO *file;
void *telnet; /* private for telnet.c-eyes only */
#if 0 /* no need for special ones for these: */
struct LDAP *ldap;