summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author ajrhacker <ajrhacker@users.noreply.github.com>2017-03-27 18:47:30 -0400
committer GitHub <noreply@github.com>2017-03-27 18:47:30 -0400
commit22639b388990657411c5d53bc3334871d588d327 (patch)
tree86eaaca129fdb1c33dc4c2e01cfcada201c7e187
parent1752afe842a3fe88815278179de4e5b2450ce7d0 (diff)
parentd9c468b4d283174b4f92cd641b8a8ae664ecd2b6 (diff)
Merge pull request #2194 from valgrind/master
Fix unintentional string concatenation
-rw-r--r--src/devices/cpu/sm510/sm510d.cpp2
-rw-r--r--src/tools/imgtool/filtbas.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/cpu/sm510/sm510d.cpp b/src/devices/cpu/sm510/sm510d.cpp
index 030b2157f63..382daa0d9d3 100644
--- a/src/devices/cpu/sm510/sm510d.cpp
+++ b/src/devices/cpu/sm510/sm510d.cpp
@@ -59,7 +59,7 @@ static const char *const s_mnemonics[] =
"ADDC", "PDTW", "TW", "DTW",
"ATS", "EXKSA", "EXKFA",
"RMF", "SMF", "COMCN",
- "TA", "TM", "TG"
+ "TA", "TM", "TG",
//
"LC", "LM", "LE", "LAF", "LAS", "LDF", "BS0", "BS1", "XL", "XM", "XI", "XEI", "XD", "XED", "XE", "BM0", "BM1", "SM1",
diff --git a/src/tools/imgtool/filtbas.cpp b/src/tools/imgtool/filtbas.cpp
index eac4b9d5173..bafd3222dce 100644
--- a/src/tools/imgtool/filtbas.cpp
+++ b/src/tools/imgtool/filtbas.cpp
@@ -652,7 +652,7 @@ static const char *const dragonbas_functions[] =
"TIMER", /* 0xff9e */
"PPOINT", /* 0xff9f */
"STRING$", /* 0xffa0 */
- "USR" /* 0xffa1 */
+ "USR", /* 0xffa1 */
"CVN", /* 0xffa2 */
"FREE", /* 0xffa3 */
"LOC", /* 0xffa4 */