[Scummvm-git-logs] scummvm master -> 3309c574c031f9a92457b3ccedd3210db50a9706

[ccawley2011]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
68e700ea54 PSP2: Fix warning
3309c574c0 DS: Replace strlcpy with Common::strlcpy


Commit: 68e700ea54b25084f4e7929746f1379865d754bd
    https://github.com/scummvm/scummvm/commit/68e700ea54b25084f4e7929746f1379865d754bd
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-05-01T16:43:04+01:00

Commit Message:
PSP2: Fix warning

Changed paths:
    backends/platform/sdl/psp2/psp2.cpp


diff --git a/backends/platform/sdl/psp2/psp2.cpp b/backends/platform/sdl/psp2/psp2.cpp
index 28b0edf..6919343 100644
--- a/backends/platform/sdl/psp2/psp2.cpp
+++ b/backends/platform/sdl/psp2/psp2.cpp
@@ -142,8 +142,10 @@ void OSystem_PSP2::setFeatureState(Feature f, bool enable) {
 	case kFeatureTouchpadMode:
 		ConfMan.setBool("touchpad_mouse_mode", enable);
 		break;
+	default:
+		OSystem_SDL::setFeatureState(f, enable);
+		break;
 	}
-	OSystem_SDL::setFeatureState(f, enable);
 }
 
 bool OSystem_PSP2::getFeatureState(Feature f) {


Commit: 3309c574c031f9a92457b3ccedd3210db50a9706
    https://github.com/scummvm/scummvm/commit/3309c574c031f9a92457b3ccedd3210db50a9706
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-05-01T16:43:26+01:00

Commit Message:
DS: Replace strlcpy with Common::strlcpy

Changed paths:
    backends/fs/ds/ds-fs.cpp


diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp
index 1df54a9..8c51f10 100644
--- a/backends/fs/ds/ds-fs.cpp
+++ b/backends/fs/ds/ds-fs.cpp
@@ -484,11 +484,11 @@ FILE *std_fopen(const char *name, const char *mode) {
 
 	// Remove file system prefix
 	if ((name[0] == 'd') && (name[1] == 's') && (name[2] == ':') && (name[3] == '/')) {
-		strlcpy(realName, name + 4, MAXPATHLEN);
+		Common::strlcpy(realName, name + 4, MAXPATHLEN);
 	} else if ((name[0] == 'm') && (name[1] == 'p') && (name[2] == ':') && (name[3] == '/')) {
-		strlcpy(realName, name + 4, MAXPATHLEN);
+		Common::strlcpy(realName, name + 4, MAXPATHLEN);
 	} else {
-		strlcpy(realName, name, MAXPATHLEN);
+		Common::strlcpy(realName, name, MAXPATHLEN);
 	}
 
 //	consolePrintf("Open file:");