diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:24:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:24:59 +0200 |
| commit | a6c743e5ec5d213d3aa6404553fe65d59f065799 (patch) | |
| tree | 8ec5ec4d77dea8a12280b965c2c5ba7f5051158f /runtime/var.c | |
| parent | 7db9f96fe9ecb9f8e05d45cc888aa488d8aed85f (diff) | |
| parent | 845c6f59b91e9988f856556cbb0e88e275e8e591 (diff) | |
| download | rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.gz rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.tar.bz2 rsyslog-a6c743e5ec5d213d3aa6404553fe65d59f065799.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/var.c')
| -rw-r--r-- | runtime/var.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/var.c b/runtime/var.c index 559bc56c..ef7cc8e6 100644 --- a/runtime/var.c +++ b/runtime/var.c @@ -366,7 +366,7 @@ ConvForOperation(var_t *pThis, var_t *pOther) case VARTYPE_NUMBER: /* check if we can convert pThis to a number, if so use number format. */ iRet = ConvToNumber(pThis); - if(iRet != RS_RET_NOT_A_NUMBER) { + if(iRet == RS_RET_NOT_A_NUMBER) { CHKiRet(ConvToString(pOther)); } else { FINALIZE; /* OK or error */ @@ -384,7 +384,7 @@ ConvForOperation(var_t *pThis, var_t *pOther) break; case VARTYPE_STR: iRet = ConvToNumber(pOther); - if(iRet != RS_RET_NOT_A_NUMBER) { + if(iRet == RS_RET_NOT_A_NUMBER) { CHKiRet(ConvToString(pThis)); } else { FINALIZE; /* OK or error */ |