Permalink
Browse files

IOS: Replace strdup with Common::String

  • Loading branch information...
csnover authored and sev- committed Dec 5, 2017
1 parent 481b608 commit d43732ac47bacab53578c6217cb4dbd42da6b9c6
@@ -111,7 +111,7 @@ OSystem_iOS7::OSystem_iOS7() :
_screenOrientation(kScreenOrientationFlippedLandscape), _mouseClickAndDragEnabled(false),
_gestureStartX(-1), _gestureStartY(-1), _fullScreenIsDirty(false), _fullScreenOverlayIsDirty(false),
_mouseDirty(false), _timeSuspended(0), _lastDragPosX(-1), _lastDragPosY(-1), _screenChangeCount(0),
_lastErrorMessage(NULL), _mouseCursorPaletteEnabled(false), _gfxTransactionError(kTransactionSuccess) {
_mouseCursorPaletteEnabled(false), _gfxTransactionError(kTransactionSuccess) {
_queuedInputEvent.type = Common::EVENT_INVALID;
_touchpadModeEnabled = !iOS7_isBigDevice();
#ifdef IPHONE_SANDBOXED
@@ -352,8 +352,7 @@ void OSystem_iOS7::logMessage(LogMessageType::Type type, const char *message) {
output = stderr;

if (type == LogMessageType::kError) {
free(_lastErrorMessage);
_lastErrorMessage = strdup(message);
_lastErrorMessage = message;
}

fputs(message, output);
@@ -27,6 +27,7 @@
#include "backends/platform/ios7/ios7_common.h"
#include "backends/base-backend.h"
#include "common/events.h"
#include "common/str.h"
#include "audio/mixer_intern.h"
#include "backends/fs/posix/posix-fs-factory.h"
#include "graphics/colormasks.h"
@@ -109,7 +110,7 @@ class OSystem_iOS7 : public EventsBaseBackend, public PaletteManager {
bool _fullScreenOverlayIsDirty;
int _screenChangeCount;

char *_lastErrorMessage;
Common::String _lastErrorMessage;

#ifdef IPHONE_SANDBOXED
Common::String _chrootBasePath;
@@ -52,8 +52,8 @@ static void displayAlert(void *ctx) {
}

void OSystem_iOS7::fatalError() {
if (_lastErrorMessage) {
dispatch_async_f(dispatch_get_main_queue(), _lastErrorMessage, displayAlert);
if (_lastErrorMessage.size()) {
dispatch_async_f(dispatch_get_main_queue(), (void *)_lastErrorMessage.c_str(), displayAlert);
for(;;);
}
else {

0 comments on commit d43732a

Please sign in to comment.