X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgtk%2Fmemwin.c;h=96be0b5e40a458af1b22a31f56abb2e0c0d436cd;hb=f7e3f1d8d0438f52e4f988a12318075cc1b43568;hp=bced9e65f247c6006ff70f97ee4f96a251683c13;hpb=00deadc94f868a45431b58e34e707d235cf02b47;p=emu8051.git

diff --git a/src/gtk/memwin.c b/src/gtk/memwin.c
index bced9e6..96be0b5 100644
--- a/src/gtk/memwin.c
+++ b/src/gtk/memwin.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdint.h>
 #include <stdbool.h>
 #include <ctype.h> /* For isprint */
 #include <zlib.h> /* For crc32 routine */
@@ -42,7 +43,7 @@ enum {
 struct memwin_infos_t {
 	GtkWidget *memlist;
 	int data_rows;
-	u_int32_t *crc;
+	uint32_t *crc;
 	int crc_init;
 };
 
@@ -83,7 +84,7 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
 	gpointer memory_id_ptr;
 	GtkTreeIter iter;
 	int address;
-	u_int8_t old;
+	uint8_t old;
 	int new;
 	char *str;
 
@@ -103,6 +104,8 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
 
 	/* Get base address. */
 	gtk_tree_model_get(model, &iter, COL_ADDRESS, &str, -1);
+
+	/* No need to check error, has already been validated. */
 	address = asciihex2int(str);
 
 	/* Convert column number (1, 2, 3...) to index (0, 1, 2...) */
@@ -114,9 +117,12 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
 
 	/* Convert new value (asciihex) to integer. */
 	new = asciihex2int(new_str);
-	if ((new < 0) || (new > 255)) {
-		log_info("  new value: out of range");
-		new = old; /* Put back old value... */
+	if (asciihex2int_get_error()) {
+		log_warn("  new value: invalid");
+		return;
+	} else if ((new < 0) || (new > 255)) {
+		log_warn("  new value: out of range");
+		return;
 	} else {
 		log_info("  new value: $%02X", new);
 	}
@@ -223,7 +229,7 @@ compute_data_rows(int memory_id)
 	if (memwin_infos->crc)
 		free(memwin_infos->crc);
 
-	memwin_infos->crc = malloc(memwin_infos->data_rows * sizeof(u_int32_t));
+	memwin_infos->crc = malloc(memwin_infos->data_rows * sizeof(uint32_t));
 	memwin_infos->crc_init = false;
 }
 
@@ -286,8 +292,8 @@ static int
 memwin_row_changed(enum mem_id_t memory_id, int row, unsigned int address)
 {
 	int row_changed;
-	u_int32_t crc_new = 0;
-	u_int8_t *buf8;
+	uint32_t crc_new = 0;
+	uint8_t *buf8;
 
 	buf8 = mem_getbuf(memory_id, address);
 	crc_new = crc32(0L, Z_NULL, 0);
@@ -351,7 +357,7 @@ memwin_refresh(enum mem_id_t memory_id)
 			gtk_list_store_set(store, &iter, COL_ADDRESS, str, -1);
 
 			for (col = 0; col < cfg->bytes_per_row; col++) {
-				u_int8_t data;
+				uint8_t data;
 
 				data = mem_read8(memory_id, address + col);