diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-05-28 12:06:35 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-05-28 12:06:35 -0700 |
| commit | 7e460b62054a56e6f1271925daf79177f6758c4c (patch) | |
| tree | 020db1e224a98b55f7a4349091b01ffd828d934f | |
| parent | 692ac7df1d9ab19712ca1256f4f84cf18d55169c (diff) | |
| parent | 8d97d73fbc1e1df51be6af761c4e2c9e412a40f7 (diff) | |
| download | vyatta-cfg-7e460b62054a56e6f1271925daf79177f6758c4c.tar.gz vyatta-cfg-7e460b62054a56e6f1271925daf79177f6758c4c.zip | |
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg into larkspur
| -rw-r--r-- | src/cli_new.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cli_new.c b/src/cli_new.c index b2d6e1d..bfd2d8c 100644 --- a/src/cli_new.c +++ b/src/cli_new.c @@ -929,7 +929,7 @@ boolean val_cmp(const valstruct *left, const valstruct *right, vtw_cond_e cond) //don't bother comparing if these are different types. if ((rcur || right->cnt) - && right->val_types[rcur] != NULL) { + && right->val_types[rcur] != ERROR_TYPE) { if (right->val_types[rcur] != val_type) { continue; } @@ -957,7 +957,7 @@ boolean val_cmp(const valstruct *left, const valstruct *right, vtw_cond_e cond) left_parts+5); if ((rcur || right->cnt) - && right->val_types[rcur] != NULL) { + && right->val_types[rcur] != ERROR_TYPE) { format = cond_formats[right->val_types[rcur]]; } (void) sscanf(rval, format, right_parts, right_parts+1, |