Revision: 601
http://rpy.svn.sourceforge.net/rpy/?rev=601&view=rev
Author: lgautier
Date: 2008-08-03 07:29:05 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
- removed warning when compiling rinterface.c (variable citems no longer used)
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-02 22:25:02 UTC
(rev 600)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-08-03 07:29:05 UTC
(rev 601)
@@ -185,12 +185,9 @@
}
PyDoc_STRVAR(EmbeddedR_setWriteConsole_doc,
- "setWriteConsoleEmbeddedR()\n\
- \n\
- Set the R console output.");
+ "Use the function to handle R console output.");
-
static void
EmbeddedR_WriteConsole(const char *buf, int len)
{
@@ -292,9 +289,9 @@
return res;
}
PyDoc_STRVAR(EmbeddedR_init_doc,
- "initEmbeddedR()\n\
- \n\
- Initialize an embedded R.");
+ "\
+Initialize an embedded R.\
+");
static PyObject* EmbeddedR_end(PyObject *self, Py_ssize_t fatal)
@@ -918,17 +915,15 @@
int is_PySexpObject;
/* named args */
- PyObject *citems, *argValue, *argName;
+ PyObject *argValue, *argName;
char *argNameString;
unsigned int addArgName;
Py_ssize_t itemLength;
- //citems = PyMapping_Items(args);
for (arg_i=0; arg_i<largs; arg_i++) {
//printf("item: %i\n", arg_i);
tmp_obj = PyTuple_GetItem(args, arg_i);
if (! tmp_obj) {
PyErr_Format(PyExc_ValueError, "No un-named item %i !?", arg_i);
- //Py_XDECREF(citems);
goto fail;
}
itemLength = PyObject_Length(tmp_obj);
@@ -944,7 +939,6 @@
addArgName = 1;
} else {
PyErr_SetString(PyExc_TypeError, "All keywords must be strings.");
- Py_XDECREF(citems);
goto fail;
}
argValue = PyTuple_GetItem(tmp_obj, 1);
@@ -952,14 +946,12 @@
if (! is_PySexpObject) {
PyErr_Format(PyExc_ValueError,
"All parameters must be of type Sexp_Type.");
- //Py_XDECREF(citems);
goto fail;
}
tmp_R = RPY_SEXP((PySexpObject *)argValue);
//tmp_R = Rf_duplicate(tmp_R);
if (! tmp_R) {
PyErr_Format(PyExc_ValueError, "NULL SEXP.");
- //Py_XDECREF(citems);
goto fail;
}
SETCAR(c_R, tmp_R);
@@ -973,7 +965,6 @@
c_R = CDR(c_R);
}
- //Py_XDECREF(citems);
//FIXME: R_GlobalContext ?
PROTECT(res_R = do_eval_expr(call_R, R_GlobalEnv));
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/rpy-list
