Changeset 5475ecf in buchla-emu for emu/ser.c

Timestamp:

09/03/2017 10:37:08 AM (7 years ago)

Author:

Alexander Heinrich <alex.heinrich@…>

Branches:

master

Children:

f51359c

Parents:

43ea417 (diff), 4f967e8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​ssh://bob.lopatic.de:11501/home/git/buchla-emu into lcda

File:

• emu/ser.c (modified) (5 diffs)

emu/ser.c

@@ -60 +60 @@
 };
 
-static uint8_t mem[CON_H][CON_W + 1];
+static uint8_t mem[CON_H][CON_W];
 
 static SDL_Window *win;
@@ -81 +81 @@
 static void scroll(void)
 {
-        memmove(mem, mem + 1, (CON_H - 1) * (CON_W + 1));
+        memmove(mem, mem + 1, (CON_H - 1) * CON_W);
         memset(mem + (CON_H - 1), ' ', CON_W);
 }
@@ -256 +256 @@
         for (int32_t y = 0; y < CON_H; ++y) {
                 char line[CON_W + 1];
+                line[CON_W] = 0;
 
                 if (SDL_LockMutex(cpu_mutex) < 0) {
@@ -261 +262 @@
                 }
 
-                memcpy(line, mem[y], CON_W + 1);
+                memcpy(line, mem[y], CON_W);
 
                 if (SDL_UnlockMutex(cpu_mutex) < 0) {
@@ -515 +516 @@
                         mem[y][x] = ' ';
                 }
-
-                mem[y][CON_W] = 0;
         }
 }