[Pkg-owncloud-commits] [owncloud] 129/457: flush() comments + perf opt

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit a577e723b0e46f5afcfd1cbee27215e832340509
Author: jknockaert <jasper at knockaert.nl>
Date:   Fri May 22 22:13:27 2015 +0200

    flush() comments + perf opt
---
 lib/private/files/stream/encryption.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index dfffad3..22d230e 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -412,14 +412,16 @@ class Encryption extends Wrapper {
 			// we are handling that separately here and we don't want to
 			// get into an infinite loop
 			$encrypted = $this->encryptionModule->encrypt($this->cache);
-			parent::stream_write($encrypted);
+			$bytesWritten = parent::stream_write($encrypted);
 			$this->writeFlag = false;
-			// If the write concerns the last block then then update the encrypted filesize
+			// Check whether the write concerns the last block
+			// If so then update the encrypted filesize
 			// Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
 			// We recalculate the encrypted filesize as we do not know the context of calling flush()
-			if ((int)floor($this->unencryptedSize/$this->unencryptedBlockSize) === (int)floor($this->position/$this->unencryptedBlockSize)) {
-				$this->size = $this->util->getBlockSize() * (int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
-				$this->size += strlen($encrypted);
+			$completeBlocksInFile=(int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
+			if ($completeBlocksInFile === (int)floor($this->position/$this->unencryptedBlockSize)) {
+				$this->size = $this->util->getBlockSize() * $completeBlocksInFile;
+				$this->size += $bytesWritten;
 				$this->size += $this->headerSize;
 			}
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git