From f8d6cd98a0bda174906c677d68e70f930ce821dc Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 3 Sep 2016 19:44:49 -0500 Subject: [PATCH] Minor cleanups --- src/std/link/links.dbd.pod | 6 +++--- src/std/link/lnkCalc.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/std/link/links.dbd.pod b/src/std/link/links.dbd.pod index 9cff283d0..facfb9106 100644 --- a/src/std/link/links.dbd.pod +++ b/src/std/link/links.dbd.pod @@ -132,15 +132,15 @@ numeric literal or an embedded link inside C<{}> braces. An optional string specifying the engineering units for the result of the expression. Equivalent to the C field of a record. -item prec +=item prec An optional integer specifying the numeric precision with which the calculation -result should be displayed. Equivalent to the E field of a record. +result should be displayed. Equivalent to the C field of a record. =back =head4 Example - {calc: {expr:"A+B", args:[1, 2]}} + {calc: {expr:"A*B", args:[{db:"record.VAL"}, 1.5]}} =cut diff --git a/src/std/link/lnkCalc.c b/src/std/link/lnkCalc.c index 015dd0311..6544898e4 100644 --- a/src/std/link/lnkCalc.c +++ b/src/std/link/lnkCalc.c @@ -45,13 +45,14 @@ typedef long (*FASTCONVERT)(); typedef struct calc_link { jlink jlink; /* embedded object */ int nArgs; - enum {ps_init, + enum { + ps_init, ps_expr, ps_major, ps_minor, ps_args, ps_prec, ps_units, - ps_error} - pstate; + ps_error + } pstate; epicsEnum16 stat; epicsEnum16 sevr; short prec;