hrev52803 adds 1 changeset to branch 'master'
old head: 20312cfe7be70bbd9cca9fd2dcabd5a6e5f0cb66
new head: 1342ec2c91285a974ddec5750c1336b54366cb09
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=1342ec2c9128+%5E20312cfe7be7
----------------------------------------------------------------------------
1342ec2c9128: Storage Kit: Fix PVS 692
Merge two if statements that has same conditional expressions
at line 198 and 201.
Change-Id: I797a77d7f2b88ae2cacd8569fdd09c0d1a19d038
Reviewed-on: https://review.haiku-os.org/c/915
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
[ Murai Takashi <tmurai01@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52803
Commit: 1342ec2c91285a974ddec5750c1336b54366cb09
URL: https://git.haiku-os.org/haiku/commit/?id=1342ec2c9128
Author: Murai Takashi <tmurai01@xxxxxxxxx>
Date: Thu Jan 24 11:08:37 2019 UTC
Committer: Stephan Aßmus <superstippi@xxxxxx>
Commit-Date: Sun Jan 27 16:18:06 2019 UTC
----------------------------------------------------------------------------
1 file changed, 1 insertion(+), 2 deletions(-)
src/kits/storage/mime/AssociatedTypes.cpp | 3 +--
----------------------------------------------------------------------------
diff --git a/src/kits/storage/mime/AssociatedTypes.cpp
b/src/kits/storage/mime/AssociatedTypes.cpp
index 8b67579423..a8d966d0e7 100644
--- a/src/kits/storage/mime/AssociatedTypes.cpp
+++ b/src/kits/storage/mime/AssociatedTypes.cpp
@@ -195,10 +195,9 @@ AssociatedTypes::SetFileExtensions(const char *type, const
BMessage *extensions)
std::set<std::string> oldExtensions;
std::set<std::string> &newExtensions = fFileExtensions[type];
// Make a copy of the previous extensions
- if (!err)
+ if (!err) {
oldExtensions = newExtensions;
- if (!err) {
// Read through the list of new extensions, creating the new
// file extensions list and adding the type as an associated
type
// for each extension
