fixed DEF_NAM_FMT definition

[rrdtool.git] / src / rrd_rpncalc.c

diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index 3c7ccb8..8e64d8b 100644 (file)
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -6,6 +6,7 @@
 
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
+#include "rrd_graph.h"
 #include <limits.h>
 
 short addop2str(enum op_en op, enum op_en op_type, char *op_str, 
@@ -271,7 +272,7 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){
 
 
 #define match_op_param(VV,VVV) \
-        else if (sscanf(expr, #VVV "(%[a-z0-9]s)",vname) == 1) { \
+        else if (sscanf(expr, #VVV "(" DEF_NAM_FMT ")",vname) == 1) { \
           int length = 0; \
           if ((length = strlen(#VVV)+strlen(vname)+2, \
               expr[length] == ',' || expr[length] == '\0') ) { \
@@ -323,7 +324,7 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){
 #undef match_op
 
 
-            else if ((sscanf(expr,"%29[_A-Za-z0-9]%n",
+            else if ((sscanf(expr, DEF_NAM_FMT "%n",
                              vname,&pos) == 1) 
                      && ((rpnp[steps].ptr = (*lookup)(key_hash,vname)) != -1)){
                 rpnp[steps].op = OP_VARIABLE;