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

adapt db_get_field_and_count to dbChannel_get_count

Browse Source
This commit is contained in:
Michael Davidsaver
2012-04-27 13:21:42 -04:00
parent 8bf53d3c59
commit e37c5c99bb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ioc/db/db_access.c
+5 -4
View File
@@ -127,8 +127,8 @@ int dbChannel_get(struct dbChannel *chan,
int buffer_type, void *pbuffer, long no_elements, void *pfl)
{
long nRequest = no_elements;
int result = db_get_field_and_count(
paddr, buffer_type, pbuffer, &nRequest, pfl);
int result = dbChannel_get_count(
chan, buffer_type, pbuffer, &nRequest, pfl);
if (nRequest < no_elements) {
/* The database request returned fewer elements than requested, so
* fill the remainder of the buffer with zeros.
@@ -145,10 +145,11 @@ int dbChannel_get(struct dbChannel *chan,
/* Performs the work of the public db_get_field API, but also returns the number
* of elements actually copied to the buffer. The caller is responsible for
* zeroing the remaining part of the buffer. */
int epicsShareAPI db_get_field_and_count(
struct dbAddr *paddr, int buffer_type,
int epicsShareAPI dbChannel_get_count(
struct dbChannel *chan, int buffer_type,
void *pbuffer, long *nRequest, void *pfl)
{
dbAddr *paddr=&chan->addr;
long status;
long options;
long i;
src/ioc/db/db_access_routines.h
+2 -3
View File
@@ -35,9 +35,8 @@ epicsShareFunc int dbChannel_get(struct dbChannel *chan,
int buffer_type, void *pbuffer, long no_elements, void *pfl);
epicsShareFunc int dbChannel_put(struct dbChannel *chan, int src_type,
const void *psrc, long no_elements);
epicsShareFunc int epicsShareAPI db_get_field_and_count(
struct dbAddr *paddr, int buffer_type,
void *pbuffer, long *nRequest, void *pfl);
epicsShareFunc int epicsShareAPI dbChannel_get_count(struct dbChannel *chan,
int buffer_type, void *pbuffer, long *nRequest, void *pfl);
#ifdef __cplusplus