Author: infinoid
Date: Mon Dec 15 08:44:49 2008
New Revision: 33919
Modified:
trunk/src/events.c
trunk/src/exceptions.c
Log:
[src] Fix the following warnings:
src/events.c:808: warning: null argument where non-null required (argument 1)
src/events.c:912: warning: null argument where non-null required (argument 1)
src/exceptions.c:215: warning: ignoring return value of 'die_from_exception',
declared with attribute warn_unused_result
src/exceptions.c:295: warning: ignoring return value of 'die_from_exception',
declared with attribute warn_unused_result
Modified: trunk/src/events.c
==============================================================================
--- trunk/src/events.c (original)
+++ trunk/src/events.c Mon Dec 15 08:44:49 2008
@@ -805,7 +805,7 @@
for (i = 0; i < ios->n; ++i) {
parrot_event * const ev = ios->events[i];
PMC * const pio = ev->u.io_event.pio;
- const int fd = Parrot_io_getfd(NULL, pio);
+ const int fd = Parrot_io_getfd(ev->interp, pio);
if (fd == ready_rd) {
/* remove from event list */
@@ -909,7 +909,7 @@
case IO_THR_MSG_ADD_SELECT_RD:
{
PMC * const pio =
buf.ev->u.io_event.pio;
- const int fd = Parrot_io_getfd(NULL,
pio);
+ const int fd =
Parrot_io_getfd(buf.ev->interp, pio);
if (FD_ISSET(fd, &act_rfds)) {
mem_sys_free(buf.ev);
break;
Modified: trunk/src/exceptions.c
==============================================================================
--- trunk/src/exceptions.c (original)
+++ trunk/src/exceptions.c Mon Dec 15 08:44:49 2008
@@ -194,6 +194,7 @@
if (PMC_IS_NULL(handler)) {
STRING * const message = VTABLE_get_string(interp, exception);
const INTVAL severity = VTABLE_get_integer_keyed_str(interp,
exception, CONST_STRING(interp, "severity"));
+ PMC *dead;
if (severity < EXCEPT_error) {
PMC *resume = VTABLE_get_attr_str(interp, exception,
CONST_STRING(interp, "resume"));
@@ -212,7 +213,7 @@
return VTABLE_invoke(interp, resume, NULL);
}
}
- die_from_exception(interp, exception);
+ dead = die_from_exception(interp, exception);
}
address = VTABLE_invoke(interp, handler, dest);
@@ -292,7 +293,7 @@
RunProfile * const profile = interp->profile;
Parrot_runloop *return_point = interp->current_runloop;
if (PMC_IS_NULL(handler)) {
- die_from_exception(interp, exception);
+ PMC *dead = die_from_exception(interp, exception);
}
/* If profiling, remember end time of lastop and generate entry for
