[Scummvm-git-logs] scummvm master -> b7dfd620be9e77f52c1321702629a6d534d79d6e

bluegr bluegr at gmail.com
Mon Aug 2 12:13:10 UTC 2021


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

Summary:
b7dfd620be SYMBIAN: FS: Fix codestyle from #3170.


Commit: b7dfd620be9e77f52c1321702629a6d534d79d6e
    https://github.com/scummvm/scummvm/commit/b7dfd620be9e77f52c1321702629a6d534d79d6e
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-08-02T15:13:07+03:00

Commit Message:
SYMBIAN: FS: Fix codestyle from #3170.

Changed paths:
    backends/fs/symbian/symbian-fs-factory.cpp
    backends/fs/symbian/symbian-fs.cpp
    backends/fs/symbian/symbianstream.cpp


diff --git a/backends/fs/symbian/symbian-fs-factory.cpp b/backends/fs/symbian/symbian-fs-factory.cpp
index 311a0bfd82..045bb82622 100644
--- a/backends/fs/symbian/symbian-fs-factory.cpp
+++ b/backends/fs/symbian/symbian-fs-factory.cpp
@@ -37,4 +37,5 @@ AbstractFSNode *SymbianFilesystemFactory::makeCurrentDirectoryFileNode() const {
 AbstractFSNode *SymbianFilesystemFactory::makeFileNodePath(const Common::String &path) const {
 	return new SymbianFilesystemNode(path);
 }
+
 #endif
diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp
index bfa9781d51..c8fd23f0c2 100644
--- a/backends/fs/symbian/symbian-fs.cpp
+++ b/backends/fs/symbian/symbian-fs.cpp
@@ -122,10 +122,10 @@ AbstractFSNode *SymbianFilesystemNode::getChild(const Common::String &n) const {
 bool SymbianFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool hidden) const {
 	assert(_isDirectory);
 
-	//TODO: honor the hidden flag
+	// TODO: honor the hidden flag.
 
 	if (_isPseudoRoot) {
-		// Drives enumeration
+		// Drives enumeration.
 		RFs &fs = FsSession();
 		TInt driveNumber;
 		TChar driveLetter;
@@ -144,7 +144,7 @@ bool SymbianFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
 			driveLetterValue = driveLetter;
 
 			if (volumeInfo.iName.Length() > 0) {
-				driveLabel8.Copy(volumeInfo.iName); // 16 to 8bit des // enabling this line alone gives KERN-EXEC 3 with non-optimized GCC? WHY? grrr
+				driveLabel8.Copy(volumeInfo.iName); // 8bit to 16 des // Enabling this line alone gives KERN-EXEC 3 with non-optimized GCC? WHY? Grrr...
 				driveString8.Format(_L8("Drive %c: (%S)"), driveLetterValue, &driveLabel8);
 			} else {
 				driveString8.Format(_L8("Drive %c:"), driveLetterValue);
@@ -189,7 +189,7 @@ bool SymbianFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
 				entry._path +=(char *)nameBuf.PtrZ();
 				entry._isDirectory = fileentry.IsDir();
 
-				// Honor the chosen mode
+				// Honor the chosen mode.
 				if ((mode == Common::FSNode::kListFilesOnly && entry._isDirectory) ||
 					(mode == Common::FSNode::kListDirectoriesOnly && !entry._isDirectory))
 					continue;
diff --git a/backends/fs/symbian/symbianstream.cpp b/backends/fs/symbian/symbianstream.cpp
index 8bdd29e1ec..4bf1d70408 100644
--- a/backends/fs/symbian/symbianstream.cpp
+++ b/backends/fs/symbian/symbianstream.cpp
@@ -29,7 +29,7 @@
 
 #define KInputBufferLength 128
 
-// Symbian libc file functionality in order to provide shared file handles
+// Symbian libc file functionality in order to provide shared file handles.
 class TSymbianFileEntry {
 public:
 	RFile _fileHandle;
@@ -100,7 +100,7 @@ size_t ReadData(const void* ptr, size_t size, size_t numItems, TSymbianFileEntry
 	TUint32 totsize = size*numItems;
 	TPtr8 pointer ( (unsigned char*) ptr, totsize);
 
-	// Nothing cached and we want to load at least KInputBufferLength bytes
+	// Nothing cached and we want to load at least KInputBufferLength bytes.
 	if (totsize >= KInputBufferLength) {
 		TUint32 totLength = 0;
 		if (entry->_inputPos != KErrNotFound) {
@@ -118,7 +118,7 @@ size_t ReadData(const void* ptr, size_t size, size_t numItems, TSymbianFileEntry
 		pointer.Set((unsigned char*) ptr, totLength, totsize);
 
 	} else {
-		// Nothing in buffer
+		// Nothing in buffer.
 		if (entry->_inputPos == KErrNotFound) {
 			TPtr8 cacheBuffer( (unsigned char*) entry->_inputBuffer, KInputBufferLength);
 			entry->_lastError = entry->_fileHandle.Read(cacheBuffer);
@@ -236,7 +236,7 @@ bool SymbianStdioStream::seek(int64 offs, int whence) {
 	entry->_eofReached = EFalse;
 	entry->_fileHandle.Seek(seekMode, pos);
 
-	return true;	// FIXME: Probably should return a value based on what _fileHandle.Seek returns
+	return true;	// FIXME: Probably should return a value based on what _fileHandle.Seek returns.
 }
 
 uint32 SymbianStdioStream::read(void *ptr, uint32 len) {




More information about the Scummvm-git-logs mailing list