[haiku-commits] haiku: hrev52649 - in src: kits/tracker bin add-ons/kernel/bus_managers/firewire

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 14 Dec 2018 17:52:49 -0500 (EST)

hrev52649 adds 3 changesets to branch 'master'
old head: 16a54a87fd1ac197d692100600b6933a3afb223d
new head: e000ae2c885b9d7174236da6553ab5999ed9bec9
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=e000ae2c885b+%5E16a54a87fd1a

----------------------------------------------------------------------------

3fb9ab7fb65b: bus_managers/firewire: Fix PVS 396
  
  Fix 'info' is assigned values twice successively.
  
  Change-Id: I981d3176a41a5f7616ef5a20dae889f1f01525bd
  Reviewed-on: https://review.haiku-os.org/764
  Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

e3af9ff0bf50: kits/tracker: Fix PVS 923
  
  Fix 'entry' is assigned values twice successively.
  
  Change-Id: I86456bf156eb48f3966439a854256e27ee87caaf
  Reviewed-on: https://review.haiku-os.org/765
  Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

e000ae2c885b: bin/notify: Fix PVS 741
  
  Fix 'bitmap' is assigned values twice successively.
  
  Change-Id: I02d70a581a682607f6ed280b71cc33c54738b343
  Reviewed-on: https://review.haiku-os.org/766
  Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

                                      [ Murai Takashi <tmurai01@xxxxxxxxx> ]

----------------------------------------------------------------------------

3 files changed, 3 insertions(+), 8 deletions(-)
src/add-ons/kernel/bus_managers/firewire/firewire_module.cpp | 3 +--
src/bin/notify.cpp                                           | 4 +---
src/kits/tracker/IconCache.cpp                               | 4 +---

############################################################################

Commit:      3fb9ab7fb65b7d9344c6ce63a4fbedb43711c89b
URL:         https://git.haiku-os.org/haiku/commit/?id=3fb9ab7fb65b
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Nov 18 23:43:16 2018 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Dec 14 22:52:42 2018 UTC

bus_managers/firewire: Fix PVS 396

Fix 'info' is assigned values twice successively.

Change-Id: I981d3176a41a5f7616ef5a20dae889f1f01525bd
Reviewed-on: https://review.haiku-os.org/764
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/bus_managers/firewire/firewire_module.cpp 
b/src/add-ons/kernel/bus_managers/firewire/firewire_module.cpp
index 6f6fbf323d..ac991a631e 100644
--- a/src/add-ons/kernel/bus_managers/firewire/firewire_module.cpp
+++ b/src/add-ons/kernel/bus_managers/firewire/firewire_module.cpp
@@ -142,12 +142,11 @@ static status_t
 fw_module_init(void)
 {
        status_t status;
-       pci_info *info = NULL;
        int i, found;
        fwohci_softc_t *fwohci_sc;
        struct firewire_softc *fw_sc;
 
-       info = (pci_info*)malloc(sizeof(pci_info));
+       pci_info *info = (pci_info*)malloc(sizeof(pci_info));
        if (!info)
                return B_NO_MEMORY;
 

############################################################################

Commit:      e3af9ff0bf50711f1bebe8a01826c754e9dccc8c
URL:         https://git.haiku-os.org/haiku/commit/?id=e3af9ff0bf50
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Nov 18 23:40:39 2018 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Dec 14 22:52:42 2018 UTC

kits/tracker: Fix PVS 923

Fix 'entry' is assigned values twice successively.

Change-Id: I86456bf156eb48f3966439a854256e27ee87caaf
Reviewed-on: https://review.haiku-os.org/765
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/IconCache.cpp b/src/kits/tracker/IconCache.cpp
index e09980f96a..1812a3ea84 100644
--- a/src/kits/tracker/IconCache.cpp
+++ b/src/kits/tracker/IconCache.cpp
@@ -659,8 +659,6 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache>*,
        if (wellKnownEntry == NULL)
                return NULL;
 
-       IconCacheEntry* entry = NULL;
-
        BString type("tracker/active_");
        type += wellKnownEntry->name;
 
@@ -669,7 +667,7 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache>*,
 
        source = kTrackerSupplied;
 
-       entry = fSharedCache.FindItem(type.String());
+       IconCacheEntry* entry = fSharedCache.FindItem(type.String());
        if (entry != NULL) {
                entry = entry->ResolveIfAlias(&fSharedCache, entry);
                if (entry->HaveIconBitmap(mode, size))

############################################################################

Revision:    hrev52649
Commit:      e000ae2c885b9d7174236da6553ab5999ed9bec9
URL:         https://git.haiku-os.org/haiku/commit/?id=e000ae2c885b
Author:      Murai Takashi <tmurai01@xxxxxxxxx>
Date:        Sun Nov 18 23:34:15 2018 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Dec 14 22:52:42 2018 UTC

bin/notify: Fix PVS 741

Fix 'bitmap' is assigned values twice successively.

Change-Id: I02d70a581a682607f6ed280b71cc33c54738b343
Reviewed-on: https://review.haiku-os.org/766
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>

----------------------------------------------------------------------------

diff --git a/src/bin/notify.cpp b/src/bin/notify.cpp
index c2030b6404..ff68cb75ed 100644
--- a/src/bin/notify.cpp
+++ b/src/bin/notify.cpp
@@ -205,10 +205,8 @@ NotifyApp::_Usage() const
 BBitmap*
 NotifyApp::_GetBitmap(const entry_ref* ref) const
 {
-       BBitmap* bitmap = NULL;
-
        // First try by contents
-       bitmap = BTranslationUtils::GetBitmap(ref);
+       BBitmap* bitmap = BTranslationUtils::GetBitmap(ref);
        if (bitmap)
                return bitmap;
 


Other related posts:

  • » [haiku-commits] haiku: hrev52649 - in src: kits/tracker bin add-ons/kernel/bus_managers/firewire - waddlesplash