]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'bugfix/log_hex_buffer_pr1519' into 'master'
authorJiang Jiang Jian <jack@espressif.com>
Tue, 23 Jan 2018 14:45:41 +0000 (22:45 +0800)
committerJiang Jiang Jian <jack@espressif.com>
Tue, 23 Jan 2018 14:45:55 +0000 (22:45 +0800)
Fix hexdump comment and array size. See issue #1518.

See merge request !1832

components/log/log.c

index 370c8b01cef54a24dbbe16d97dacab8776037e55..589f1983a1c7ff586262e1c28490bd3e72e61eb2 100644 (file)
@@ -419,8 +419,8 @@ void esp_log_buffer_hexdump_internal( const char *tag, const void *buffer, uint1
     char temp_buffer[BYTES_PER_LINE+3];   //for not-byte-accessible memory
     const char *ptr_line;
     //format: field[length]
-    // ADDR[10]+" "+DATA_HEX[8*3]+" "+DATA_HEX[8*3]+"  |"+DATA_CHAR[8]+"|"
-    char hd_buffer[10+2+BYTES_PER_LINE*3+3+BYTES_PER_LINE+1+1];
+    // ADDR[10]+"   "+DATA_HEX[8*3]+" "+DATA_HEX[8*3]+"  |"+DATA_CHAR[8]+"|"
+    char hd_buffer[10+3+BYTES_PER_LINE*3+3+BYTES_PER_LINE+1+1];
     char *ptr_hd;
     int bytes_cur_line;