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

jlif future proof for 64-bit json parser

Browse Source
This commit is contained in:
Michael Davidsaver
2017-05-03 17:27:57 -04:00
parent 1cad1c5ba6
commit b4c625d8d1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ioc/db/dbJLink.h
View File

@@ -62,7 +62,7 @@ typedef struct jlif {
jlif_result (*parse_boolean)(jlink *, int val);
/* Optional, parser saw a boolean value */
jlif_result (*parse_integer)(jlink *, long num);
jlif_result (*parse_integer)(jlink *, long long num);
/* Optional, parser saw an integer value */
jlif_result (*parse_double)(jlink *, double num);

2
src/ioc/db/test/jlinkz.c
View File

@@ -187,7 +187,7 @@ void z_free(jlink *pj)
}
static
jlif_result z_int(jlink *pj, long num)
jlif_result z_int(jlink *pj, long long num)
{
zpriv *priv = CONTAINER(pj, zpriv, base);

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

@@ -109,12 +109,12 @@ static void lnkCalc_free(jlink *pjlink)
free(clink);
}
static jlif_result lnkCalc_integer(jlink *pjlink, long num)
static jlif_result lnkCalc_integer(jlink *pjlink, long long num)
{
calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
IFDEBUG(10)
printf("lnkCalc_integer(calc@%p, %ld)\n", clink, num);
printf("lnkCalc_integer(calc@%p, %lld)\n", clink, num);
if (clink->pstate == ps_prec) {
clink->prec = num;
@@ -123,7 +123,7 @@ static jlif_result lnkCalc_integer(jlink *pjlink, long num)
if (clink->pstate != ps_args) {
return jlif_stop;
errlogPrintf("lnkCalc: Unexpected integer %ld\n", num);
errlogPrintf("lnkCalc: Unexpected integer %lld\n", num);
}
if (clink->nArgs == CALCPERFORM_NARGS) {

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

@@ -90,13 +90,13 @@ static void lnkConst_free(jlink *pjlink)
free(clink);
}
static jlif_result lnkConst_integer(jlink *pjlink, long num)
static jlif_result lnkConst_integer(jlink *pjlink, long long num)
{
const_link *clink = CONTAINER(pjlink, const_link, jlink);
int newElems = clink->nElems + 1;
IFDEBUG(10)
printf("lnkConst_integer(const@%p, %ld)\n", pjlink, num);
printf("lnkConst_integer(const@%p, %lld)\n", pjlink, num);
switch (clink->type) {
void *buf;