X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fopen.c;h=0820102575b4cc3db96e40b88f1edfb761e953b0;hb=8a8a744341df513d00d2e60adf5e88636856e65b;hp=51d7885e8fe4776ef9079fe58d7594fa8692a6d2;hpb=7e3a0260f0a6bb7bb1c1c001649b04bbe7ad6d52;p=tpg%2Facess2.git diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c index 51d7885e..08201025 100644 --- 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; - -extern tVFS_Handle *VFS_GetHandle(int FD); 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 *chroot = CFGPTR(CFG_VFS_CHROOT); + const char *chroot = CFGPTR(CFG_VFS_CHROOT); int chrootLen; - char *cwd = CFGPTR(CFG_VFS_CWD); + const char *cwd = CFGPTR(CFG_VFS_CWD); 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) { - Warning("VFS_GetAbsPath - malloc() returned NULL"); + Log_Warning("VFS", "VFS_GetAbsPath: malloc() returned NULL"); return NULL; } strcpy(ret, Path); @@ -63,7 +61,7 @@ char *VFS_GetAbsPath(const char *Path) 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);