[haiku-development] src_build_libbe_storage_ResourcesContainer.cpp.diff

Hi there,

* fix the warning:
C++ generated/objects/linux/x86/release/build/libbe/storage/ResourcesContainer.o src/build/libbe/storage/ResourcesContainer.cpp: In member function ‘int32 BPrivate::Storage::ResourcesContainer::IndexOf(type_code, const char*) const’: src/build/libbe/storage/ResourcesContainer.cpp:148: warning: suggest parentheses around && within || 
this way:
[...]
int32
ResourcesContainer::IndexOf(type_code type, const char *name) const
{
@@ -143,16 +148,17 @@
for (int32 i = 0; index == -1 && i < count; i++) {
ResourceItem *item = ResourceAt(i);
const char *itemName = item->Name();
- if (item->Type() == type && (name == NULL && itemName == NULL
- || name != NULL && itemName != NULL
- && !strcmp(name, itemName))) {
+ if (item->Type() == type
+ && (((name == NULL && itemName == NULL)
+ || (name != NULL && itemName != NULL))
+ && !strcmp(name, itemName))) {
index = i;
}
}
return index;
}

[...]

* the rest are style changes,

good bye,
Vasilis


Index: src/build/libbe/storage/ResourcesContainer.cpp
===================================================================
--- src/build/libbe/storage/ResourcesContainer.cpp      (revision 25685)
+++ src/build/libbe/storage/ResourcesContainer.cpp      (working copy)
@@ -1,40 +1,45 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//---------------------------------------------------------------------
+/*
+ * Copyright 2008, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *             <unknown, please fill in who knows>
+ */
+
+
 /*!
        \file ResourcesContainer.cpp
        ResourcesContainer implementation.
 */
 
+
 #include <stdio.h>
 
 #include "ResourcesContainer.h"
-
 #include "ResourceItem.h"
 
+
 namespace BPrivate {
 namespace Storage {
 
-// constructor
+
 ResourcesContainer::ResourcesContainer()
-                                 : fResources(),
-                                       fIsModified(false)
+       :
+       fResources(),
+       fIsModified(false)
 {
 }
 
-// destructor
+
 ResourcesContainer::~ResourcesContainer()
 {
        MakeEmpty();
 }
 
-// AddResource
-//
-// Returns false, if item is NULL or memory is insufficient, true otherwise.
+
+//! Returns false, if item is NULL or memory is insufficient, true otherwise.
 bool
-ResourcesContainer::AddResource(ResourceItem *item, int32 index,
-                                                               bool replace)
+ResourcesContainer::AddResource(ResourceItem *item, int32 index, bool replace)
 {
        bool result = false;
        if (item) {
@@ -50,7 +55,7 @@
        return result;
 }
 
-// RemoveResource
+
 ResourceItem*
 ResourcesContainer::RemoveResource(int32 index)
 {
@@ -60,14 +65,14 @@
        return item;
 }
 
-// RemoveResource
+
 bool
 ResourcesContainer::RemoveResource(ResourceItem *item)
 {
        return RemoveResource(IndexOf(item));
 }
 
-// MakeEmpty
+
 void
 ResourcesContainer::MakeEmpty()
 {
@@ -77,7 +82,7 @@
        SetModified(false);
 }
 
-// AssimilateResources
+
 void
 ResourcesContainer::AssimilateResources(ResourcesContainer &container)
 {
@@ -98,14 +103,14 @@
        SetModified(true);
 }
 
-// IndexOf
+
 int32
 ResourcesContainer::IndexOf(ResourceItem *item) const
 {
        return fResources.IndexOf(item);
 }
 
-// IndexOf
+
 int32
 ResourcesContainer::IndexOf(const void *data) const
 {
@@ -120,7 +125,7 @@
        return index;
 }
 
-// IndexOf
+
 int32
 ResourcesContainer::IndexOf(type_code type, int32 id) const
 {
@@ -134,7 +139,7 @@
        return index;
 }
 
-// IndexOf
+
 int32
 ResourcesContainer::IndexOf(type_code type, const char *name) const
 {
@@ -143,16 +148,17 @@
        for (int32 i = 0; index == -1 && i < count; i++) {
                ResourceItem *item = ResourceAt(i);
                const char *itemName = item->Name();
-               if (item->Type() == type && (name == NULL && itemName == NULL
-                                                                        || 
name != NULL && itemName != NULL
-                                                                               
&& !strcmp(name, itemName))) {
+               if (item->Type() == type
+                       && (((name == NULL && itemName == NULL)
+                               || (name != NULL && itemName != NULL))
+                                       && !strcmp(name, itemName))) {
                        index = i;
                }
        }
        return index;
 }
 
-// IndexOfType
+
 int32
 ResourcesContainer::IndexOfType(type_code type, int32 typeIndex) const
 {
@@ -169,21 +175,21 @@
        return index;
 }
 
-// ResourceAt
+
 ResourceItem*
 ResourcesContainer::ResourceAt(int32 index) const
 {
        return (ResourceItem*)fResources.ItemAt(index);
 }
 
-// CountResources
+
 int32
 ResourcesContainer::CountResources() const
 {
        return fResources.CountItems();
 }
 
-// SetModified
+
 void
 ResourcesContainer::SetModified(bool modified)
 {
@@ -196,7 +202,7 @@
        }
 }
 
-// IsModified
+
 bool
 ResourcesContainer::IsModified() const
 {
@@ -210,7 +216,3 @@
 
 };     // namespace Storage
 };     // namespace BPrivate
-
-
-
-

Other related posts: