epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Add lnkConst_remove, fix debug messages

Browse Source
This commit is contained in:
Andrew Johnson
2016-09-04 16:02:59 -05:00
parent ec6d86c91c
commit 4448317d73
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/std/link/lnkCalc.c
View File

@@ -91,7 +91,7 @@ static void lnkCalc_free(jlink *pjlink) {
int i;
IFDEBUG(10)
printf("lnkCalc_free(calc@%p)\n", pjlink);
printf("lnkCalc_free(calc@%p)\n", clink);
for (i = 0; i < clink->nArgs; i++)
dbJLinkFree(clink->inp[i].value.json.jlink);
@@ -107,7 +107,7 @@ static jlif_result lnkCalc_integer(jlink *pjlink, long num) {
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_integer(calc@%p, %ld)\n", pjlink, num);
printf("lnkCalc_integer(calc@%p, %ld)\n", clink, num);
if (clink->pstate == ps_prec) {
clink->prec = num;
@@ -134,7 +134,7 @@ static jlif_result lnkCalc_double(jlink *pjlink, double num) {
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_double(calc@%p, %g)\n", pjlink, num);
printf("lnkCalc_double(calc@%p, %g)\n", clink, num);
if (clink->pstate != ps_args) {
return jlif_stop;
@@ -200,7 +200,7 @@ static jlif_key_result lnkCalc_start_map(jlink *pjlink) {
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_start_map(calc@%p)\n", pjlink);
printf("lnkCalc_start_map(calc@%p)\n", clink);
if (clink->pstate == ps_args)
return jlif_key_child_link;
@@ -217,8 +217,7 @@ static jlif_result lnkCalc_map_key(jlink *pjlink, const char *key, size_t len) {
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_map_key(calc@%p, \"%.*s\")\n",
pjlink, (int) len, key);
printf("lnkCalc_map_key(calc@%p, \"%.*s\")\n", pjlink, (int) len, key);
if (len == 4) {
if (!strncmp(key, "expr", len) && !clink->post_expr)
@@ -256,7 +255,7 @@ static jlif_result lnkCalc_end_map(jlink *pjlink) {
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_end_map(calc@%p)\n", pjlink);
printf("lnkCalc_end_map(calc@%p)\n", clink);
if (clink->pstate == ps_error)
return jlif_stop;
@@ -268,7 +267,7 @@ static jlif_result lnkCalc_start_array(jlink *pjlink) {
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_start_array(calc@%p)\n", pjlink);
printf("lnkCalc_start_array(calc@%p)\n", clink);
if (clink->pstate != ps_args) {
errlogPrintf("lnkCalc: Unexpected array\n");
@@ -282,7 +281,7 @@ static jlif_result lnkCalc_end_array(jlink *pjlink) {
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_end_array(calc@%p)\n", pjlink);
printf("lnkCalc_end_array(calc@%p)\n", clink);
if (clink->pstate == ps_error)
return jlif_stop;

14
src/std/link/lnkConst.c
View File

@@ -278,6 +278,16 @@ static void lnkConst_report(const jlink *pjlink) {
/*************************** lset Routines **************************/
static void lnkConst_remove(struct dbLocker *locker, struct link *plink)
{
clink *clink = CONTAINER(plink->value.json.jlink, struct clink, jlink);
IFDEBUG(10)
printf("lnkConst_remove(const@%p)\n", clink);
lnkConst_free(plink->value.json.jlink);
}
static long lnkConst_loadScalar(struct link *plink, short dbrType, void *pbuffer)
{
clink *clink = CONTAINER(plink->value.json.jlink, struct clink, jlink);
@@ -438,7 +448,7 @@ static long lnkConst_getValue(struct link *plink, short dbrType, void *pbuffer,
long *pnRequest)
{
IFDEBUG(10)
printf("lnkConst_loadScalar(const@%p, %d, %p, ... (%ld))\n",
printf("lnkConst_getValue(const@%p, %d, %p, ... (%ld))\n",
plink->value.json.jlink, dbrType, pbuffer, *pnRequest);
if (pnRequest)
@@ -451,7 +461,7 @@ static long lnkConst_getValue(struct link *plink, short dbrType, void *pbuffer,
static lset lnkConst_lset = {
1, 0, /* Constant, not Volatile */
NULL, NULL,
NULL, lnkConst_remove,
lnkConst_loadScalar, lnkConst_loadLS, lnkConst_loadArray, NULL,
NULL, lnkConst_getNelements, lnkConst_getValue,
NULL, NULL, NULL,