[incubator-nuttx] branch master updated: Revert "tools/nxstyle: Back out part of last commit. Logic to avoid some false alarms was causing real style problems from being reported."

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 0715ab3  Revert "tools/nxstyle:  Back out part of last commit.  Logic to avoid some false alarms was causing real style problems from being reported."
0715ab3 is described below

commit 0715ab3132c6cf1df246ea7309910c607fe30193
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Fri Mar 6 14:44:31 2020 +0900

    Revert "tools/nxstyle:  Back out part of last commit.  Logic to avoid some false alarms was causing real style problems from being reported."
    
    If we are going to use this tool for things like
    git pre-commit hook or CI workflow, it's critical to
    avoid false alarms.
    
    This reverts commit de764af9aa5364d2dc02e09e377cbab230302d74.
---
 tools/nxstyle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/nxstyle.c b/tools/nxstyle.c
index 0a403c7..66bdb49 100644
--- a/tools/nxstyle.c
+++ b/tools/nxstyle.c
@@ -700,7 +700,7 @@ int main(int argc, char **argv, char **envp)
                * preceding line has no comment.
                */
 
-              if (line[n] != '}' /* && line[n] != '#' */ && !prevbrhcmt)
+              if (line[n] != '}' && line[n] != '#' && !prevbrhcmt)
                 {
                    ERROR("Missing blank line after comment", comment_lineno,
                          1);