Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions devsupApp/src/dbfield.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static PyObject* pyField_putval(pyField *self, PyObject* args)
{
PyObject *val;
void *rawfield;
rset *prset;
rset *prset = NULL;

if(!PyArg_ParseTuple(args, "O", &val))
return NULL;
Expand Down Expand Up @@ -327,10 +327,13 @@ static PyObject* pyField_putval(pyField *self, PyObject* args)
} else {
dest[0] = '\0';
}
if (self->addr.special == SPC_MOD)
if (self->addr.special == SPC_MOD) {
/* This is needed for long string support. */
if (prset = dbGetRset(&self->addr))
prset = dbGetRset(&self->addr);
if (prset) {
prset->special(&self->addr, 1);
}
}
#if PY_MAJOR_VERSION >= 3
Py_DECREF(data);
#endif
Expand Down
5 changes: 4 additions & 1 deletion pyIocApp/devsupMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,10 @@ int main(int argc, char *argv[])
iocsh(NULL);
} else {
if (loadedDb) {
epicsThreadExitMain();
// non-interactive IOC. spin forever
while(true) {
epicsThreadSleep(1000.0);
}
} else {
printf("%s: Nothing to do!\n", arg0);
usage(EXIT_FAILURE);
Expand Down
Loading