riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14317 from fjmolinas/pr_fix_od_werror

Browse Source 
sys/od/od: fix -Werror=char-subscripts
This commit is contained in:
Alexandre Abadie 2020-06-22 14:59:44 +02:00 committed by GitHub
commit 02578cfbd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/od/od.c
View File

@ -42,8 +42,8 @@ void od_hex_dump(const void *data, size_t data_len, uint8_t width)
} }
print_str(" "); print_str(" ");
for(unsigned k = 0; k < (i % width) + 1; k++){ for(unsigned k = 0; k < (i % width) + 1; k++){
if(isprint(((char *)data)[str_pos+k])){ if(isprint(((uint8_t *)data)[str_pos+k])){
putchar(((char *)data)[str_pos+k]); putchar(((uint8_t *)data)[str_pos+k]);
} }
else{ else{
putchar('.'); putchar('.');

8
tests/od/Makefile
View File

@ -1,12 +1,6 @@
include ../Makefile.tests_common include ../Makefile.tests_common
USEMODULE += od USEMODULE += od
# USEMODULE += od_string USEMODULE += od_string
ifeq (,$(filter od_string,$(USEMODULE)))
TESTS=$(APPDIR)/tests/01-run.py
else
TESTS=$(APPDIR)/tests/02-run.py
endif
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

40
tests/od/tests/01-run.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (C) 2016 Freie Universität Berlin # Copyright (C) 2017 Hamburg University of Applied Sciences
# #
# This file is subject to the terms and conditions of the GNU Lesser # This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level # General Public License v2.1. See the file LICENSE in the top level
@ -12,29 +12,29 @@ from testrunner import run
def testfunc(child): def testfunc(child):
child.expect_exact("od_hex_dump(short_str, sizeof(short_str), OD_WIDTH_DEFAULT)") child.expect_exact("od_hex_dump(short_str, sizeof(short_str), OD_WIDTH_DEFAULT)")
child.expect_exact("00000000 41 42 00") child.expect_exact("00000000 41 42 00 AB.")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), OD_WIDTH_DEFAULT)") child.expect_exact("od_hex_dump(long_str, sizeof(long_str), OD_WIDTH_DEFAULT)")
child.expect_exact("00000000 FF 2C 61 FF 2E 62 63 64 65 66 67 68 69 6A 6B 6C") child.expect_exact("00000000 FF 2C 61 FF 2E 62 63 64 65 66 67 68 69 6A 6B 6C .,a..bcdefghijkl")
child.expect_exact("00000010 6D 6E 6F 70 00") child.expect_exact("00000010 6D 6E 6F 70 00 mnop.")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 4)") child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 4)")
child.expect_exact("00000000 FF 2C 61 FF") child.expect_exact("00000000 FF 2C 61 FF .,a.")
child.expect_exact("00000004 2E 62 63 64") child.expect_exact("00000004 2E 62 63 64 .bcd")
child.expect_exact("00000008 65 66 67 68") child.expect_exact("00000008 65 66 67 68 efgh")
child.expect_exact("0000000C 69 6A 6B 6C") child.expect_exact("0000000C 69 6A 6B 6C ijkl")
child.expect_exact("00000010 6D 6E 6F 70") child.expect_exact("00000010 6D 6E 6F 70 mnop")
child.expect_exact("00000014 00") child.expect_exact("00000014 00 .")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 3)") child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 3)")
child.expect_exact("00000000 FF 2C 61") child.expect_exact("00000000 FF 2C 61 .,a")
child.expect_exact("00000003 FF 2E 62") child.expect_exact("00000003 FF 2E 62 ..b")
child.expect_exact("00000006 63 64 65") child.expect_exact("00000006 63 64 65 cde")
child.expect_exact("00000009 66 67 68") child.expect_exact("00000009 66 67 68 fgh")
child.expect_exact("0000000C 69 6A 6B") child.expect_exact("0000000C 69 6A 6B ijk")
child.expect_exact("0000000F 6C 6D 6E") child.expect_exact("0000000F 6C 6D 6E lmn")
child.expect_exact("00000012 6F 70 00") child.expect_exact("00000012 6F 70 00 op.")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 8)") child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 8)")
child.expect_exact("00000000 FF 2C 61 FF 2E 62 63 64") child.expect_exact("00000000 FF 2C 61 FF 2E 62 63 64 .,a..bcd")
child.expect_exact("00000008 65 66 67 68 69 6A 6B 6C") child.expect_exact("00000008 65 66 67 68 69 6A 6B 6C efghijkl")
child.expect_exact("00000010 6D 6E 6F 70 00") child.expect_exact("00000010 6D 6E 6F 70 00 mnop.")
print("All tests successful") print("All tests successful")

43
tests/od/tests/02-run.py
View File

@ -1,43 +0,0 @@
#!/usr/bin/env python3
# Copyright (C) 2017 Hamburg University of Applied Sciences
#
# This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.
import sys
from testrunner import run
def testfunc(child):
child.expect_exact("od_hex_dump(short_str, sizeof(short_str), OD_WIDTH_DEFAULT)")
child.expect_exact("00000000 41 42 00 AB.")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), OD_WIDTH_DEFAULT)")
child.expect_exact("00000000 FF 2C 61 FF 2E 62 63 64 65 66 67 68 69 6A 6B 6C .,a..bcdefghijkl")
child.expect_exact("00000010 6D 6E 6F 70 00 mnop.")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 4)")
child.expect_exact("00000000 FF 2C 61 FF .,a.")
child.expect_exact("00000004 2E 62 63 64 .bcd")
child.expect_exact("00000008 65 66 67 68 efgh")
child.expect_exact("0000000C 69 6A 6B 6C ijkl")
child.expect_exact("00000010 6D 6E 6F 70 mnop")
child.expect_exact("00000014 00 .")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 3)")
child.expect_exact("00000000 FF 2C 61 .,a")
child.expect_exact("00000003 FF 2E 62 ..b")
child.expect_exact("00000006 63 64 65 cde")
child.expect_exact("00000009 66 67 68 fgh")
child.expect_exact("0000000C 69 6A 6B ijk")
child.expect_exact("0000000F 6C 6D 6E lmn")
child.expect_exact("00000012 6F 70 00 op.")
child.expect_exact("od_hex_dump(long_str, sizeof(long_str), 8)")
child.expect_exact("00000000 FF 2C 61 FF 2E 62 63 64 .,a..bcd")
child.expect_exact("00000008 65 66 67 68 69 6A 6B 6C efghijkl")
child.expect_exact("00000010 6D 6E 6F 70 00 mnop.")
print("All tests successful")
if __name__ == "__main__":
sys.exit(run(testfunc, timeout=1))