X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fbinary.c;h=58d86d778d3df6a85bce464426753ff4b6d8f033;hb=952891ddb96a341c0e24ecb7dec6361c7bbeaece;hp=5a919e177b8fb9f48baa744b45db9c99d951337b;hpb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;p=tpg%2Facess2.git

diff --git a/Kernel/binary.c b/Kernel/binary.c
index 5a919e17..58d86d77 100644
--- a/Kernel/binary.c
+++ b/Kernel/binary.c
@@ -28,7 +28,7 @@ extern char	*Threads_GetName(int ID);
 extern Uint	MM_ClearUser(void);
 extern void	Proc_StartUser(Uint Entrypoint, Uint *Bases, int ArgC, char **ArgV, char **EnvP, int DataSize);
 extern tKernelSymbol	gKernelSymbols[];
-extern void		gKernelSymbolsEnd;
+extern tKernelSymbol	gKernelSymbolsEnd[];
 extern tBinaryType	gELF_Info;
 
 // === PROTOTYPES ===
@@ -101,7 +101,7 @@ int Proc_Execve(const char *File, const char **ArgV, const char **EnvP)
 {
 	 int	argc, envc, i;
 	 int	argenvBytes;
-	char	*argenvBuf, *strBuf;
+	char	**argenvBuf, *strBuf;
 	char	**argvSaved, **envpSaved;
 	char	*savedFile;
 	Uint	entry;
@@ -127,10 +127,10 @@ int Proc_Execve(const char *File, const char **ArgV, const char **EnvP)
 		LEAVE('i', 0);
 		return 0;
 	}
-	strBuf = argenvBuf + (argc+1)*sizeof(void*) + (envc+1)*sizeof(void*);
+	strBuf = (char*)argenvBuf + (argc+1)*sizeof(void*) + (envc+1)*sizeof(void*);
 	
 	// Populate
-	argvSaved = (char **) argenvBuf;
+	argvSaved = argenvBuf;
 	for( i = 0; i < argc; i++ )
 	{
 		argvSaved[i] = strBuf;
@@ -744,7 +744,7 @@ void *Binary_LoadKernel(const char *File)
 	// Relocate Library
 	if( !Binary_Relocate( (void*)base ) )
 	{
-		Warning("[BIN ] Relocation of '%s' failed, unloading", sTruePath);
+		Log_Warning("BIN", "Relocation of '%s' failed, unloading", sTruePath);
 		Binary_Unload( (void*)base );
 		Binary_Dereference( pBinary );
 		LEAVE('n');