summaryrefslogtreecommitdiff
path: root/nuttx/tools
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-23 19:55:32 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-04-23 19:55:32 +0000
commit942bbb7ad67be9b4117e752fcb4bcac280452f9f (patch)
treec9f06686092f52befad620eaf5a4a0edbcb33a44 /nuttx/tools
parent782a98407637ecdf9afa27d99cd178d1c75db4d3 (diff)
downloadpx4-nuttx-942bbb7ad67be9b4117e752fcb4bcac280452f9f.tar.gz
px4-nuttx-942bbb7ad67be9b4117e752fcb4bcac280452f9f.tar.bz2
px4-nuttx-942bbb7ad67be9b4117e752fcb4bcac280452f9f.zip
Kconfig updated + NFS update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4646 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/tools')
-rw-r--r--nuttx/tools/cmpconfig.c9
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;
}