[augeas-devel] augeas: master - Better error message for too many args in a path expression

[David Lutterkort]

Gitweb:        http://git.fedorahosted.org/git/augeas.git?p=augeas.git;a=commitdiff;h=6adfee876dcbff4f043a9380a1ede09d889acb09
Commit:        6adfee876dcbff4f043a9380a1ede09d889acb09
Parent:        d442e5c97be6c335e96018363b8d744cc34e18b0
Author:        David Lutterkort <lutter at redhat.com>
AuthorDate:    Thu Sep 10 15:21:41 2009 -0700
Committer:     David Lutterkort <lutter at redhat.com>
CommitterDate: Thu Sep 10 15:21:41 2009 -0700

Better error message for too many args in a path expression

---
 src/internal.h |    3 ++-
 src/pathx.c    |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/internal.h b/src/internal.h
index fcc3982..1f4e8b3 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -388,7 +388,8 @@ typedef enum {
     PATHX_ETYPE,
     PATHX_ENOVAR,
     PATHX_EEND,
-    PATHX_ENONODES
+    PATHX_ENONODES,
+    PATHX_EARITY
 } pathx_errcode_t;
 
 struct pathx;
diff --git a/src/pathx.c b/src/pathx.c
index 83ef88e..466951c 100644
--- a/src/pathx.c
+++ b/src/pathx.c
@@ -42,7 +42,8 @@ static const char *const errcodes[] = {
     "type error",       /* PATHX_ETYPE */
     "undefined variable",               /* PATHX_ENOVAR */
     "garbage at end of path expression",/* PATHX_EEND */
-    "can not expand tree from empty nodeset"  /* PATHX_ENONODES */
+    "can not expand tree from empty nodeset",  /* PATHX_ENONODES */
+    "wrong number of arguments in function call" /* PATHX_EARITY */
 };
 
 /*
@@ -1585,7 +1586,7 @@ static void parse_function_call(struct state *state) {
     }
 
     if (nargs != func->arity) {
-        STATE_ERROR(state, PATHX_EDELIM);
+        STATE_ERROR(state, PATHX_EARITY);
         return;
     }