diff mbox

[2/2] kconfig: trivial - adjust comments

Message ID 1552040.ObFWAZURHi@tacticalops (mailing list archive)
State New, archived
Headers show

Commit Message

Martin Walch Feb. 13, 2014, 12:57 p.m. UTC 
From: Martin Walch <walch.martin@web.de>
Date: Thu, 13 Feb 2014 12:17:06 +0100
Subject: [PATCH 2/2] kconfig: trivial - adjust comments

the line
(a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
is probably copy & paste from above, missing the adjustment done in the code.
It should probably read
(a!='b') && (a='c') -> 'b'='c' ? 'n' : a='c'

the second case is similar:
(a!='m') && (a!='n') -> (a='m')
should be
(a!='m') && (a!='n') -> (a='y')

This patch intentionally violates the checkpatch.pl style check by keeping C99 comments:
there are many of them, and consequently they all should be converted, but this is beyond
the scope of this patch.

Signed-off-by: Martin Walch <walch.martin@web.de>
---
 scripts/kconfig/expr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 4aa171b..4b73854 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -460,7 +460,7 @@  static struct expr *expr_join_and(struct expr *e1, struct expr *e2)
 							     : expr_alloc_symbol(&symbol_no);
 		}
 		if (e1->type == E_UNEQUAL && e2->type == E_EQUAL) {
-			// (a='b') && (a!='c') -> 'b'='c' ? 'n' : a='b'
+			// (a!='b') && (a='c') -> 'b'='c' ? 'n' : a='c'
 			sym2 = e2->right.sym;
 			if ((e1->right.sym->flags & SYMBOL_CONST) && (sym2->flags & SYMBOL_CONST))
 				return sym2 != e1->right.sym ? expr_alloc_comp(E_EQUAL, sym1, sym2)
@@ -481,7 +481,7 @@  static struct expr *expr_join_and(struct expr *e1, struct expr *e2)
 		if (e1->type == E_UNEQUAL && e2->type == E_UNEQUAL &&
 			   ((e1->right.sym == &symbol_mod && e2->right.sym == &symbol_no) ||
 			    (e1->right.sym == &symbol_no && e2->right.sym == &symbol_mod)))
-			// (a!='m') && (a!='n') -> (a='m')
+			// (a!='m') && (a!='n') -> (a='y')
 			return expr_alloc_comp(E_EQUAL, sym1, &symbol_yes);
 
 		if ((e1->type == E_SYMBOL && e2->type == E_EQUAL && e2->right.sym == &symbol_mod) ||