Compare commits

...

4 Commits

4 changed files with 8 additions and 1 deletions

1
.ci Submodule

Submodule .ci added at 87942a7c29

View File

@@ -216,6 +216,7 @@ LIBCOM_API long
int cond_count = 0;
char * const pdest = pout;
char *pnext;
const char* psrc_orig = psrc;
if (psrc == NULL || *psrc == '\0' ||
pout == NULL || perror == NULL) {
@@ -470,8 +471,12 @@ LIBCOM_API long
*pout = END_EXPRESSION;
if (cond_count != 0) {
fprintf(stderr, "Deprecated CALC \"%s\": %s\n",
psrc_orig, calcErrorStr(CALC_ERR_CONDITIONAL));
/*
*perror = CALC_ERR_CONDITIONAL;
goto bad;
*/
}
if (operand_needed || runtime_depth != 1) {
*perror = CALC_ERR_INCOMPLETE;

View File

@@ -638,7 +638,7 @@ epicsFindAddr(void *addr, epicsSymbol *sym_p)
if ( nearest.raw && ( (idx = ARR(c,nearest,0,st_name)) < es->strMap->max ) ) {
sym_p->s_nam = strtab + idx;
sym_p->s_val = (char*) ARR(c, nearest, 0, st_value) + es->addr;
sym_p->s_val = (char*)(size_t) ARR(c, nearest, 0, st_value) + es->addr;
}
return 0;

View File

@@ -20,6 +20,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <loadLib.h>
#include <ioLib.h>
#include "dbmf.h"
#include "epicsString.h"