summaryrefslogtreecommitdiff
path: root/spectro/ex1.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-06 05:38:49 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-06 05:38:49 +0100
commit9491825ddff7a294d1f49061bae7044e426aeb2e (patch)
tree06e651099f87140ec534ae47fb8ce1ac6ec7976d /spectro/ex1.c
parentfa756339d4204bff7f2820067f58214d32780d17 (diff)
Imported Upstream version 1.8.3
Diffstat (limited to 'spectro/ex1.c')
-rwxr-xr-x[-rw-r--r--]spectro/ex1.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/spectro/ex1.c b/spectro/ex1.c
index 93d0a31..b336cbc 100644..100755
--- a/spectro/ex1.c
+++ b/spectro/ex1.c
@@ -147,6 +147,10 @@ static int ex1_set_boxcar(ex1 *p, int nobox);
static int ex1_measure(ex1 *p, double *raw);
+static int ex1_save_calibration(ex1 *p);
+static int ex1_restore_calibration(ex1 *p);
+static int ex1_touch_calibration(ex1 *p);
+
/* ----------------------------------------------------------------- */
/* Establish communications with a ex1 */
@@ -1038,6 +1042,7 @@ ex1_del(inst *pp) {
if (p->conv != NULL)
p->conv->del(p->conv);
+ p->vdel(pp);
free(p);
}
}
@@ -1234,7 +1239,7 @@ extern ex1 *new_ex1(icoms *icom, instType itype) {
/* =============================================================================== */
/* Calibration info save/restore */
-int ex1_save_calibration(ex1 *p) {
+static int ex1_save_calibration(ex1 *p) {
int ev = EX1_OK;
int i;
char fname[100]; /* Name */
@@ -1280,7 +1285,7 @@ int ex1_save_calibration(ex1 *p) {
}
/* Restore the all modes calibration from the local system */
-int ex1_restore_calibration(ex1 *p) {
+static int ex1_restore_calibration(ex1 *p) {
int ev = EX1_OK;
int i, j;
char fname[100]; /* Name */
@@ -1353,7 +1358,7 @@ int ex1_restore_calibration(ex1 *p) {
return ev;
}
-int ex1_touch_calibration(ex1 *p) {
+static int ex1_touch_calibration(ex1 *p) {
int ev = EX1_OK;
char fname[100]; /* Name */
int rv;