From 228b6aaa016e7e249ac54504f9c42b2732261cd3 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sun, 20 Oct 2013 16:48:29 -0700 Subject: [PATCH] Remove obsolete errno interface --- src/gba/gba-memory.c | 6 ++---- src/gba/gba.c | 2 -- src/gba/gba.h | 2 -- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gba/gba-memory.c b/src/gba/gba-memory.c index 1d8ca5688..d408befa9 100644 --- a/src/gba/gba-memory.c +++ b/src/gba/gba-memory.c @@ -7,8 +7,6 @@ #include #include -static const char* GBA_CANNOT_MMAP = "Could not map memory"; - static void GBASetActiveRegion(struct ARMMemory* memory, uint32_t region); static int GBAWaitMultiple(struct ARMMemory* memory, uint32_t startAddress, int count); @@ -40,8 +38,8 @@ void GBAMemoryInit(struct GBAMemory* memory) { if (!memory->wram || !memory->iwram) { GBAMemoryDeinit(memory); - memory->p->errno = GBA_OUT_OF_MEMORY; - memory->p->errstr = GBA_CANNOT_MMAP; + GBALog(memory->p, GBA_LOG_ERROR, "Could not map memory"); + return; } int i; diff --git a/src/gba/gba.c b/src/gba/gba.c index 11ab80c46..bf374302c 100644 --- a/src/gba/gba.c +++ b/src/gba/gba.c @@ -35,8 +35,6 @@ static void GBAHitStub(struct ARMBoard* board, uint32_t opcode); static void _checkOverrides(struct GBA* gba, uint32_t code); void GBAInit(struct GBA* gba) { - gba->errno = GBA_NO_ERROR; - gba->errstr = 0; gba->debugger = 0; gba->savefile = 0; diff --git a/src/gba/gba.h b/src/gba/gba.h index 601d16050..1683d1f94 100644 --- a/src/gba/gba.h +++ b/src/gba/gba.h @@ -88,8 +88,6 @@ struct GBA { const char* activeFile; const char* savefile; - enum GBAError errno; - const char* errstr; int logLevel; };