fix the somehow newly introduced warnings

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

View file

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

View file

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

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
*/
if (is_nested) {
/*
* if a problem occured while copying a message from userspace because
* of a wrong pointer supplied by userland, handle it the only way we
* can handle it ...
*/
if (((void*)frame->eip >= copy_msg_to_user &&
(void*)frame->eip <= __copy_msg_to_user_end) ||
((void*)frame->eip >= copy_msg_from_user &&
(void*)frame->eip <= __copy_msg_from_user_end)) {
switch(frame->vector) {
/* these error are expected */
case PAGE_FAULT_VECTOR:
case PROTECTION_VECTOR:
frame->eip = (reg_t) __user_copy_msg_pointer_failure;
return;
default:
minix_panic("Copy involving a user pointer "
"failed unexpectedly!", NO_NUM);
}
}
/*
* if a problem occured while copying a message from userspace because
* of a wrong pointer supplied by userland, handle it the only way we
* can handle it ...
*/
if (((void*)frame->eip >= (void*)copy_msg_to_user &&
(void*)frame->eip <= (void*)__copy_msg_to_user_end) ||
((void*)frame->eip >= (void*)copy_msg_from_user &&
(void*)frame->eip <= (void*)__copy_msg_from_user_end)) {
switch(frame->vector) {
/* these error are expected */
case PAGE_FAULT_VECTOR:
case PROTECTION_VECTOR:
frame->eip = (reg_t) __user_copy_msg_pointer_failure;
return;
default:
minix_panic("Copy involving a user pointer "
"failed unexpectedly!", NO_NUM);
}
}
}
if(frame->vector == PAGE_FAULT_VECTOR) {