diff options
| author | Heiko Schocher <hs@denx.de> | 2012-02-16 01:02:21 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-30 22:28:56 +0200 |
| commit | c16a123fd34256859efc789b0bcde3e029b0d12a (patch) | |
| tree | 32883f521b46f1192ae3273b32e12d0bc5c1b83c /common | |
| parent | dc3faf09d759a8acf8cf2147971e2a19832333e2 (diff) | |
| download | blackbird-obmc-uboot-c16a123fd34256859efc789b0bcde3e029b0d12a.tar.gz blackbird-obmc-uboot-c16a123fd34256859efc789b0bcde3e029b0d12a.zip | |
command, log: print with "log show" a full logbuffer
If the logbuffer contains LOGBUFF_LEN chars, they never got
printed with the "log show" command, because chars get
printed with the following for loop:
for (i = 0; i < (size & LOGBUFF_MASK); i++) {
with size = LOGBUFF_LEN and LOGBUFF_MASK = (LOGBUFF_LEN-1)
for loop never executed ...
Fix this.
Signed-off-by: Heiko Schocher <hs@denx.de>
Acked-by: Detlev Zundel <dzu@denx.de>
Fixed merge conflict.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_log.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/cmd_log.c b/common/cmd_log.c index f9fbe002c6..9a3fdc3a49 100644 --- a/common/cmd_log.c +++ b/common/cmd_log.c @@ -219,7 +219,9 @@ int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) start = log->v1.start; size = log->v1.size; } - for (i=0; i < (size&LOGBUFF_MASK); i++) { + if (size > LOGBUFF_LEN) + size = LOGBUFF_LEN; + for (i = 0; i < size; i++) { s = lbuf+((start+i)&LOGBUFF_MASK); putc (*s); } |
