Skip to contentSkip to conversation

Fix console_buffer size conflict error.

PATCH New Remy Bohmer 2 participants 3 messages Jun 17, 2010 – Jun 29, 2010

lore
Share & tools
lore

Remy Bohmer

author
#0 lore raw

PATCH 1/1 Fix console_buffer size conflict error.

The console_buffer size is declared in common/main.c as
-- char console_buffer[CONFIG_SYS_CBSIZE + 1];
so this extern definition is wrong.

Signed-off-by Remy Bohmer <[email protected]>
---
 common/hush.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
common/hush.c +1 -1
index 06c5ff8..9eea90f 100644
@@ -1018,7 +1018,7 @@ static void get_user_input(struct in_str *i)
 	fflush(stdout);
 	i->p = the_command;
 #else
-	extern char console_buffer[CONFIG_SYS_CBSIZE];
+	extern char console_buffer[];
 	int n;
 	static char the_command[CONFIG_SYS_CBSIZE];
Signature · 1 line
1.7.0.4
author
#1 lore raw

PATCH 1/1 Fix console_buffer size conflict error.

Wolfgang,

Please look at this one for the 2010.06 release.

Kind regards,

Remy

2010/6/17 Remy Bohmer <[email protected]>:

Quoted 26 lines

The console_buffer size is declared in common/main.c as ? -- char console_buffer[CONFIG_SYS_CBSIZE + 1]; so this extern definition is wrong.

Signed-off-by Remy Bohmer <[email protected]>

---
?common/hush.c | ? ?2 +-
?1 files changed, 1 insertions(+), 1 deletions(-)

common/hush.c +0 -0
index 06c5ff8..9eea90f 100644
@@ -1018,7 +1018,7 @@ static void get_user_input(struct in_str *i)
 ? ? ? ?fflush(stdout);
 ? ? ? ?i->p = the_command;

?#else
- ? ? ? extern char console_buffer[CONFIG_SYS_CBSIZE];
+ ? ? ? extern char console_buffer[];
? ? ? ?int n;
? ? ? ?static char the_command[CONFIG_SYS_CBSIZE];

--
1.7.0.4

Applied
#2 lore raw

PATCH 1/1 Fix console_buffer size conflict error.

In reply to Remy Bohmer

Dear Remy Bohmer,

Quoted 8 lines · In message <[email protected]> you wrote:

The console_buffer size is declared in common/main.c as
-- char console_buffer[CONFIG_SYS_CBSIZE + 1];
so this extern definition is wrong.

Signed-off-by Remy Bohmer <[email protected]>
---
 common/hush.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Nobody goes to that restaurant anymore. It's too crowded.