diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-05-01 16:13:57 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-05-01 16:13:57 +0200 |
commit | 094535c010320967639e8e86f974d878e80baa72 (patch) | |
tree | efc3094b20355dcbeebb2c4ece4fcfc69bffedb5 /spectro/ss_imp.c | |
parent | c07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 (diff) |
Imported Upstream version 1.7.0upstream/1.7.0
Diffstat (limited to 'spectro/ss_imp.c')
-rw-r--r-- | spectro/ss_imp.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; } |