sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix the somehow newly introduced warnings

Browse source
This commit is contained in:
David van Moolenbroek 2010-02-14 18:39:47 +00:00
parent ff835e0e35
commit e306663455
3 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/filter/md5.c
View file

@ -188,7 +188,7 @@ MD5Final (digest, ctx)
* reflect the addition of 16 longwords of new data. MD5Update blocks * reflect the addition of 16 longwords of new data. MD5Update blocks
* the data and converts bytes into longwords for this routine. * the data and converts bytes into longwords for this routine.
*/ */
static void void
MD5Transform (buf, inraw) MD5Transform (buf, inraw)
uint32 buf[4]; uint32 buf[4];
const unsigned char inraw[64]; const unsigned char inraw[64];

1
drivers/filter/optset.c
View file

@ -12,6 +12,7 @@
* May 2009 (D.C. van Moolenbroek) * May 2009 (D.C. van Moolenbroek)
*/ */
#define _MINIX 1
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <minix/config.h> #include <minix/config.h>

40
kernel/arch/i386/exception.c
View file

@ -147,26 +147,26 @@ PUBLIC void exception_handler(int is_nested, struct exception_frame * frame)
* them out quickly if the traps are not nested * them out quickly if the traps are not nested
*/ */
if (is_nested) { if (is_nested) {
/* /*
* if a problem occured while copying a message from userspace because * if a problem occured while copying a message from userspace because
* of a wrong pointer supplied by userland, handle it the only way we * of a wrong pointer supplied by userland, handle it the only way we
* can handle it ... * can handle it ...
*/ */
if (((void*)frame->eip >= copy_msg_to_user && if (((void*)frame->eip >= (void*)copy_msg_to_user &&
(void*)frame->eip <= __copy_msg_to_user_end) || (void*)frame->eip <= (void*)__copy_msg_to_user_end) ||
((void*)frame->eip >= copy_msg_from_user && ((void*)frame->eip >= (void*)copy_msg_from_user &&
(void*)frame->eip <= __copy_msg_from_user_end)) { (void*)frame->eip <= (void*)__copy_msg_from_user_end)) {
switch(frame->vector) { switch(frame->vector) {
/* these error are expected */ /* these error are expected */
case PAGE_FAULT_VECTOR: case PAGE_FAULT_VECTOR:
case PROTECTION_VECTOR: case PROTECTION_VECTOR:
frame->eip = (reg_t) __user_copy_msg_pointer_failure; frame->eip = (reg_t) __user_copy_msg_pointer_failure;
return; return;
default: default:
minix_panic("Copy involving a user pointer " minix_panic("Copy involving a user pointer "
"failed unexpectedly!", NO_NUM); "failed unexpectedly!", NO_NUM);
} }
} }
} }
if(frame->vector == PAGE_FAULT_VECTOR) { if(frame->vector == PAGE_FAULT_VECTOR) {