diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-04-23 19:55:32 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-04-23 19:55:32 +0000 |
| commit | 31640bb6a691fa4e67157ef6ae947d78630716c4 (patch) | |
| tree | c9f06686092f52befad620eaf5a4a0edbcb33a44 /nuttx/tools | |
| parent | 6d6976b06ecf8fce78aea24d9664da0533514b2e (diff) | |
| download | px4-firmware-31640bb6a691fa4e67157ef6ae947d78630716c4.tar.gz px4-firmware-31640bb6a691fa4e67157ef6ae947d78630716c4.tar.bz2 px4-firmware-31640bb6a691fa4e67157ef6ae947d78630716c4.zip | |
Kconfig updated + NFS update
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4646 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/tools')
| -rw-r--r-- | nuttx/tools/cmpconfig.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nuttx/tools/cmpconfig.c b/nuttx/tools/cmpconfig.c index 1c4cbfe1b..2958acdc7 100644 --- a/nuttx/tools/cmpconfig.c +++ b/nuttx/tools/cmpconfig.c @@ -161,6 +161,11 @@ static void parse_file(FILE *stream, struct variable_s **list) if (ptr) { parse_line(ptr, &varname, &varval); + if (!varval || strcmp(varval, "n") == 0) + { + continue; + } + if (varname) { int varlen = strlen(varname) + 1; @@ -215,7 +220,7 @@ static void compare_variables(struct variable_s *list1, struct variable_s *list2 while (list1 || list2) { - if (list1->val) + if (list1 && list1->val) { varval1 = list1->val; } @@ -224,7 +229,7 @@ static void compare_variables(struct variable_s *list1, struct variable_s *list2 varval1 = "<NULL>"; } - if (list2->val) + if (list2 && list2->val) { varval2 = list2->val; } |