From 094535c010320967639e8e86f974d878e80baa72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 1 May 2015 16:13:57 +0200 Subject: Imported Upstream version 1.7.0 --- spectro/ss_imp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'spectro/ss_imp.c') diff --git a/spectro/ss_imp.c b/spectro/ss_imp.c index 359d4c4..6f184b3 100644 --- a/spectro/ss_imp.c +++ b/spectro/ss_imp.c @@ -438,7 +438,6 @@ inst_code ss_inst_err(ss *p) { case ss_et_FilterOutOfPos: case ss_et_ProgrammingError: return inst_hardware_fail | ec; - } return inst_other_error | ec; } @@ -512,7 +511,7 @@ void ss_command(ss *p, double tmo) { p->sbuf[2] = '\00'; /* write_read terminates on nul */ p->rbuf = p->_rbuf; /* Reset read pointer */ - if ((se = p->icom->write_read(p->icom, p->_sbuf, p->_rbuf, SS_MAX_RD_SIZE, "\n", 1, tmo)) != 0) { + if ((se = p->icom->write_read(p->icom, p->_sbuf, 0, p->_rbuf, SS_MAX_RD_SIZE, NULL, "\n", 1, tmo)) != 0) { p->snerr = icoms2ss_err(se); return; } -- cgit v1.2.3