diff -r 5ec9abba1027 -r 3a1d5a52adfc src/server/public/nsapi.h --- a/src/server/public/nsapi.h Fri Mar 01 22:44:54 2013 +0100 +++ b/src/server/public/nsapi.h Sat Mar 16 23:11:34 2013 +0100 @@ -386,12 +386,17 @@ /* NOTE: both SYS_FILE and SYS_NETFD are actually NSPR PRFileDesc * and can */ /* be used with NSPR API calls (after casting them to PRFileDesc *) */ +// NOTE: no they are not NSPR PRFileDesc* +// they are VFSFile* +// TODO: fix NOTE + + #ifndef SYS_FILE_T -typedef void *SYS_FILE; +typedef struct VFSFile *SYS_FILE; #define SYS_FILE_T void * #endif /* !SYS_FILE_T */ -#define SYS_ERROR_FD ((SYS_FILE)-1) +#define SYS_ERROR_FD ((SYS_FILE)-1) // TODO: fix #ifndef SYS_NETFD_T typedef void *SYS_NETFD; @@ -641,6 +646,8 @@ typedef struct PListStruct_s PListStruct_s; typedef struct ACLListHandle ACLListHandle; +typedef struct VFS VFS; +typedef struct VFSContext VFSContext; #ifndef PR_AF_INET typedef union PRNetAddr PRNetAddr; @@ -992,6 +999,8 @@ /* 3.0 ACL list pointer */ ACLListHandle *acllist; uint32_t aclreqaccess; /* new - required access rights */ + + VFS *vfs; /* new - virtual file system */ int request_is_cacheable; /* */ int directive_is_cacheable; /* set by SAFs with no external side effects that make decisions based solely on URI and path */