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

ioc/dbStatic: rename dbRecordNode aliasedRecord -> aliasedRecnode

Browse Source
This commit is contained in:
Michael Davidsaver
2017-05-03 19:31:38 -04:00
parent 096fb5e0a2
commit 7805fbe295
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ioc/dbStatic/dbBase.h
View File

@@ -109,7 +109,7 @@ typedef struct dbRecordNode {
char *recordname;
ELLLIST infoList; /*LIST head of info nodes*/
int flags;
struct dbRecordNode *aliasedRecord; /* NULL unless flags|DBRN_FLAGS_ISALIAS */
struct dbRecordNode *aliasedRecnode; /* NULL unless flags|DBRN_FLAGS_ISALIAS */
}dbRecordNode;
/*dbRecordAttribute is for "psuedo" fields */

8
src/ioc/dbStatic/dbStaticLib.c
View File

@@ -1655,7 +1655,7 @@ long dbCreateAlias(DBENTRY *pdbentry, const char *alias)
if (!precordType) return S_dbLib_recordTypeNotFound;
/* alias of alias still references actual record */
while(precnode && (precnode->flags&DBRN_FLAGS_ISALIAS))
precnode = precnode->aliasedRecord;
precnode = precnode->aliasedRecnode;
if (!precnode) return S_dbLib_recNotFound;
zeroDbentry(pdbentry);
if (!dbFindRecord(pdbentry, alias)) return S_dbLib_recExists;
@@ -1665,7 +1665,7 @@ long dbCreateAlias(DBENTRY *pdbentry, const char *alias)
pnewnode = dbCalloc(1, sizeof(dbRecordNode));
pnewnode->recordname = epicsStrDup(alias);
pnewnode->precord = precnode->precord;
pnewnode->aliasedRecord = precnode;
pnewnode->aliasedRecnode = precnode;
pnewnode->flags = DBRN_FLAGS_ISALIAS;
precnode->flags |= DBRN_FLAGS_HASALIAS;
ellInit(&pnewnode->infoList);
@@ -1681,8 +1681,8 @@ int dbFollowAlias(DBENTRY *pdbentry)
{
if(!pdbentry->precnode)
return S_dbLib_recNotFound;
if(pdbentry->precnode->aliasedRecord)
pdbentry->precnode = pdbentry->precnode->aliasedRecord;
if(pdbentry->precnode->aliasedRecnode)
pdbentry->precnode = pdbentry->precnode->aliasedRecnode;
return 0;
}