git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IPStack - Working on removing future packet cache
[tpg/acess2.git]
/
Kernel
/
vfs
/
open.c
diff --git
a/Kernel/vfs/open.c
b/Kernel/vfs/open.c
index
51d7885
..
0820102
100644
(file)
--- a/
Kernel/vfs/open.c
+++ b/
Kernel/vfs/open.c
@@
-15,8
+15,6
@@
// === IMPORTS ===
extern tVFS_Node gVFS_MemRoot;
extern tVFS_Mount *gVFS_RootMount;
// === IMPORTS ===
extern tVFS_Node gVFS_MemRoot;
extern tVFS_Mount *gVFS_RootMount;
-
-extern tVFS_Handle *VFS_GetHandle(int FD);
extern int VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
// === CODE ===
extern int VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
// === CODE ===
@@
-32,9
+30,9
@@
char *VFS_GetAbsPath(const char *Path)
char *tmpStr;
int iPos = 0;
int iPos2 = 0;
char *tmpStr;
int iPos = 0;
int iPos2 = 0;
- c
har
*chroot = CFGPTR(CFG_VFS_CHROOT);
+ c
onst char
*chroot = CFGPTR(CFG_VFS_CHROOT);
int chrootLen;
int chrootLen;
- c
har
*cwd = CFGPTR(CFG_VFS_CWD);
+ c
onst char
*cwd = CFGPTR(CFG_VFS_CWD);
int cwdLen;
ENTER("sPath", Path);
int cwdLen;
ENTER("sPath", Path);
@@
-43,7
+41,7
@@
char *VFS_GetAbsPath(const char *Path)
if(Path[0] == '$') {
ret = malloc(strlen(Path)+1);
if(!ret) {
if(Path[0] == '$') {
ret = malloc(strlen(Path)+1);
if(!ret) {
-
Warning("VFS_GetAbsPath -
malloc() returned NULL");
+
Log_Warning("VFS", "VFS_GetAbsPath:
malloc() returned NULL");
return NULL;
}
strcpy(ret, Path);
return NULL;
}
strcpy(ret, Path);
@@
-63,7
+61,7
@@
char *VFS_GetAbsPath(const char *Path)
if(Path[0] == '/') {
ret = malloc(pathLen + 1);
if(!ret) {
if(Path[0] == '/') {
ret = malloc(pathLen + 1);
if(!ret) {
-
Warning("VFS_GetAbsPath -
malloc() returned NULL");
+
Log_Warning("VFS", "VFS_GetAbsPath:
malloc() returned NULL");
return NULL;
}
strcpy(ret, Path);
return NULL;
}
strcpy(ret, Path);
UCC
git Repository :: git.ucc.asn.au