Revision: 627
http://rpy.svn.sourceforge.net/rpy/?rev=627&view=rev
Author: lgautier
Date: 2008-08-11 22:06:42 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Fixed signature for EmbeddedR_ReadConsole() (no more warnings when compiling)
Modified Paths:
--------------
branches/rpy_nextgen/rpy/rinterface/rinterface.c
Modified: branches/rpy_nextgen/rpy/rinterface/rinterface.c
===================================================================
--- branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-08-11 21:35:10 UTC
(rev 626)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-08-11 22:06:42 UTC
(rev 627)
@@ -249,7 +249,7 @@
"Use the function to handle R console input.");
-static void
+static int
EmbeddedR_ReadConsole(const char *prompt, unsigned char *buf,
int len, int addtohistory)
{
@@ -269,7 +269,7 @@
if (readConsoleCallback == NULL) {
Py_DECREF(arglist);
- return;
+ return -1;
}
#ifdef RPY_DEBUG_CONSOLE
@@ -283,13 +283,13 @@
if (result == NULL) {
/* signal(SIGINT, old_int); */
- return;
+ return -1;
}
char *input_str = PyString_AsString(result);
if (! input_str) {
Py_XDECREF(arglist);
- return;
+ return -1;
}
/* Snatched from Rcallbacks.c in JRI */
@@ -300,7 +300,7 @@
Py_XDECREF(result);
/* signal(SIGINT, old_int); */
-
+ return 1;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
rpy-list mailing list
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
