summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven A. Falco <sfalco@harris.com>2008-06-12 13:24:42 -0400
committerWolfgang Denk <wd@denx.de>2008-07-01 23:06:53 +0200
commitf6a69559d64498a04e1e0b087a9b920e5775f866 (patch)
treef056eeb466c51881e55bcd5cefab41a298041c41
parent75678c807a6272ecc5541eb32898c93887f08400 (diff)
downloadu-boot-imx-f6a69559d64498a04e1e0b087a9b920e5775f866.zip
u-boot-imx-f6a69559d64498a04e1e0b087a9b920e5775f866.tar.gz
u-boot-imx-f6a69559d64498a04e1e0b087a9b920e5775f866.tar.bz2
cmd_nvedit.c: clean up syntax highlighting
My text-editor (vim) has a bit of trouble syntax-highlighting the cmd_nvedit.c file, because it apparently does not parse C ifdef/else/endif. The following patch does not change the behavior of the code at all, but does allow the editor to properly syntax-highlight the file. Signed-off-by: Steve Falco <sfalco@harris.com>
-rw-r--r--common/cmd_nvedit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index b102ae3..85a0f94 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -180,11 +180,12 @@ int _do_setenv (int flag, int argc, char *argv[])
* Ethernet Address and serial# can be set only once,
* ver is readonly.
*/
+ if (
#ifdef CONFIG_HAS_UID
/* Allow serial# forced overwrite with 0xdeaf4add flag */
- if ( ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
+ ((strcmp (name, "serial#") == 0) && (flag != 0xdeaf4add)) ||
#else
- if ( (strcmp (name, "serial#") == 0) ||
+ (strcmp (name, "serial#") == 0) ||
#endif
((strcmp (name, "ethaddr") == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)