diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-22 17:44:47 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-22 17:44:47 +0000 |
| commit | 75e9a2dc69bad2fe10cc60d801019731069005cf (patch) | |
| tree | 605c12a4609dc68703fd6adf324aa1cc6e4b45d4 /msg.c | |
| parent | 44ac484dd18867163735c54d052e57d52142edaa (diff) | |
| download | rsyslog-75e9a2dc69bad2fe10cc60d801019731069005cf.tar.gz rsyslog-75e9a2dc69bad2fe10cc60d801019731069005cf.tar.xz rsyslog-75e9a2dc69bad2fe10cc60d801019731069005cf.zip | |
simplified var object, now only supports strings and numbers as a single
type
Diffstat (limited to 'msg.c')
| -rw-r--r-- | msg.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -2089,33 +2089,33 @@ rsRetVal MsgSetProperty(msg_t *pThis, var_t *pProp) assert(pProp != NULL); if(isProp("iProtocolVersion")) { - setProtocolVersion(pThis, pProp->val.vShort); + setProtocolVersion(pThis, pProp->val.num); } else if(isProp("iSeverity")) { - pThis->iSeverity = pProp->val.vShort; + pThis->iSeverity = pProp->val.num; } else if(isProp("iFacility")) { - pThis->iFacility = pProp->val.vShort; + pThis->iFacility = pProp->val.num; } else if(isProp("msgFlags")) { - pThis->msgFlags = pProp->val.vInt; + pThis->msgFlags = pProp->val.num; } else if(isProp("pszRawMsg")) { - MsgSetRawMsg(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetRawMsg(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pszMSG")) { - MsgSetMSG(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetMSG(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pszUxTradMsg")) { - MsgSetUxTradMsg(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetUxTradMsg(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pszTAG")) { - MsgSetTAG(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetTAG(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pszRcvFrom")) { - MsgSetHOSTNAME(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetHOSTNAME(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pszHOSTNAME")) { - MsgSetRcvFrom(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetRcvFrom(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pCSStrucData")) { - MsgSetStructuredData(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetStructuredData(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pCSAPPNAME")) { - MsgSetAPPNAME(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetAPPNAME(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pCSPROCID")) { - MsgSetPROCID(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetPROCID(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("pCSMSGID")) { - MsgSetMSGID(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.vpCStr)); + MsgSetMSGID(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr)); } else if(isProp("tRcvdAt")) { memcpy(&pThis->tRcvdAt, &pProp->val.vSyslogTime, sizeof(struct syslogTime)); } else if(isProp("tTIMESTAMP")) { |