summaryrefslogtreecommitdiffstats
path: root/ctok_token.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-21 14:59:18 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-21 14:59:18 +0000
commit2d5d05e7c5d3c2c3e1575ae7e240492f7df34256 (patch)
treecbf6cd6b6bde716e7f55de1a3bb6944afc0093b0 /ctok_token.h
parent45136c665690534d934d0c0c188dbb18a0131b96 (diff)
downloadrsyslog-2d5d05e7c5d3c2c3e1575ae7e240492f7df34256.tar.gz
rsyslog-2d5d05e7c5d3c2c3e1575ae7e240492f7df34256.tar.xz
rsyslog-2d5d05e7c5d3c2c3e1575ae7e240492f7df34256.zip
changed tokenizer to utilize var class instead of scalar types
Diffstat (limited to 'ctok_token.h')
-rw-r--r--ctok_token.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/ctok_token.h b/ctok_token.h
index 4ea88d1a..696a769e 100644
--- a/ctok_token.h
+++ b/ctok_token.h
@@ -23,7 +23,7 @@
#define INCLUDED_CTOK_TOKEN_H
#include "obj.h"
-#include "stringbuf.h"
+#include "var.h"
/* the tokens... I use numbers below so that the tokens can be easier
* identified in debug output. These ID's are also partly resused as opcodes.
@@ -61,8 +61,9 @@ typedef struct {
ctok_CMP_STARTSWITH = 106,
ctok_CMP_GTEQ = 107, /* end compare operations */
} tok;
- cstr_t *pstrVal;
- int64 intVal;
+ var_t *pVar;
+ //cstr_t *pstrVal;
+ //int64 intVal;
} ctok_token_t;
@@ -72,7 +73,7 @@ BEGINinterface(ctok_token) /* name must also be changed in ENDinterface macro! *
rsRetVal (*Construct)(ctok_token_t **ppThis);
rsRetVal (*ConstructFinalize)(ctok_token_t __attribute__((unused)) *pThis);
rsRetVal (*Destruct)(ctok_token_t **ppThis);
- rsRetVal (*UnlinkCStr)(ctok_token_t *pThis, cstr_t **ppCStr);
+ rsRetVal (*UnlinkVar)(ctok_token_t *pThis, var_t **ppVar);
int (*IsCmpOp)(ctok_token_t *pThis);
ENDinterface(ctok_token)
#define ctok_tokenCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */