i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix coding style, thanks Axel.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39027 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-10-20 19:09:25 +00:00
parent 10cf5ccec2
commit e464481888
4 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/storage/AddOnMonitorHandler.h
+2 -2
View File
@@ -64,8 +64,8 @@ protected:
virtual void EntryRemoved(const char *name, ino_t directory, virtual void EntryRemoved(const char *name, ino_t directory,
dev_t device, ino_t node); dev_t device, ino_t node);
virtual void EntryMoved(const char *name, virtual void EntryMoved(const char *name,
const char *fromName, ino_t from_directory, const char *fromName, ino_t fromDirectory,
ino_t to_directory, dev_t device, ino_t toDirectory, dev_t device,
ino_t node, dev_t nodeDevice); ino_t node, dev_t nodeDevice);
virtual void StatChanged(ino_t node, dev_t device); virtual void StatChanged(ino_t node, dev_t device);
headers/private/storage/NodeMonitorHandler.h
+1 -1
View File
@@ -31,7 +31,7 @@ protected:
virtual void EntryRemoved(const char *name, ino_t directory, virtual void EntryRemoved(const char *name, ino_t directory,
dev_t device, ino_t node); dev_t device, ino_t node);
virtual void EntryMoved(const char *name, const char *fromName, virtual void EntryMoved(const char *name, const char *fromName,
ino_t from_directory, ino_t to_directory, dev_t device, ino_t fromDirectory, ino_t toDirectory, dev_t device,
ino_t node, dev_t nodeDevice); ino_t node, dev_t nodeDevice);
virtual void StatChanged(ino_t node, dev_t device); virtual void StatChanged(ino_t node, dev_t device);
virtual void AttrChanged(ino_t node, dev_t device); virtual void AttrChanged(ino_t node, dev_t device);
src/kits/storage/AddOnMonitorHandler.cpp
+33 -33
View File
@@ -214,19 +214,19 @@ AddOnMonitorHandler::EntryRemoved(const char* name, ino_t directory,
void void
AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName, AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
ino_t from_directory, ino_t to_directory, dev_t device, ino_t node, ino_t fromDirectory, ino_t toDirectory, dev_t device, ino_t node,
dev_t nodeDevice) dev_t nodeDevice)
{ {
node_ref toNodeRef; node_ref toNodeRef;
make_node_ref(device, to_directory, &toNodeRef); make_node_ref(device, toDirectory, &toNodeRef);
// Search the "from" and "to" directory in the known directories // Search the "from" and "to" directory in the known directories
DirectoryList::iterator from_iter = fDirectories.begin(); DirectoryList::iterator fromIter = fDirectories.begin();
bool watchingFromDirectory = _FindDirectory(from_directory, device, bool watchingFromDirectory = _FindDirectory(fromDirectory, device,
from_iter); fromIter);
DirectoryList::iterator to_iter = fDirectories.begin(); DirectoryList::iterator toIter = fDirectories.begin();
bool watchingToDirectory = _FindDirectory(toNodeRef, to_iter); bool watchingToDirectory = _FindDirectory(toNodeRef, toIter);
if (!watchingFromDirectory && !watchingToDirectory) { if (!watchingFromDirectory && !watchingToDirectory) {
// It seems the notification was for a directory we are not // It seems the notification was for a directory we are not
@@ -241,8 +241,8 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
if (!watchingToDirectory) { if (!watchingToDirectory) {
// moved out of our view // moved out of our view
EntryList::iterator eiter = from_iter->entries.begin(); EntryList::iterator eiter = fromIter->entries.begin();
if (!_FindEntry(entryNodeRef, from_iter->entries, eiter)) { if (!_FindEntry(entryNodeRef, fromIter->entries, eiter)) {
// we don't know anything about this entry yet.. ignore it // we don't know anything about this entry yet.. ignore it
return; return;
} }
@@ -250,13 +250,13 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// save the info and remove the entry // save the info and remove the entry
info = *eiter; info = *eiter;
watch_node(&entryNodeRef, B_STOP_WATCHING, this); watch_node(&entryNodeRef, B_STOP_WATCHING, this);
from_iter->entries.erase(eiter); fromIter->entries.erase(eiter);
// Start at the top again, and search until the from directory. // Start at the top again, and search until the from directory.
// If we find a add-on with the same name then the moved add-on // If we find a add-on with the same name then the moved add-on
// was not enabled. So we are done. // was not enabled. So we are done.
DirectoryList::iterator diter = fDirectories.begin(); DirectoryList::iterator diter = fDirectories.begin();
for (; diter != from_iter; diter++) { for (; diter != fromIter; diter++) {
eiter = diter->entries.begin(); eiter = diter->entries.begin();
if (_FindEntry(info.name, diter->entries, eiter)) if (_FindEntry(info.name, diter->entries, eiter))
return; return;
@@ -267,9 +267,9 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// Continue searching for a add-on below us. If we find a add-on // Continue searching for a add-on below us. If we find a add-on
// with the same name, we must enable it. // with the same name, we must enable it.
for (from_iter++; from_iter != fDirectories.end(); from_iter++) { for (fromIter++; fromIter != fDirectories.end(); fromIter++) {
eiter = from_iter->entries.begin(); eiter = fromIter->entries.begin();
if (_FindEntry(info.name, from_iter->entries, eiter)) { if (_FindEntry(info.name, fromIter->entries, eiter)) {
AddOnEnabled(&*eiter); AddOnEnabled(&*eiter);
return; return;
} }
@@ -296,7 +296,7 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// If we find an add-on with the same name then the moved add-on // If we find an add-on with the same name then the moved add-on
// is not to be enabled. So we are done. // is not to be enabled. So we are done.
DirectoryList::iterator diter = fDirectories.begin(); DirectoryList::iterator diter = fDirectories.begin();
for (; diter != to_iter; diter++) { for (; diter != toIter; diter++) {
if (_HasEntry(info.name, diter->entries)) { if (_HasEntry(info.name, diter->entries)) {
// The new add-on is being shadowed. // The new add-on is being shadowed.
return; return;
@@ -317,7 +317,7 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
AddOnEnabled(&info); AddOnEnabled(&info);
// put the new entry into the target directory // put the new entry into the target directory
_AddNewEntry(to_iter->entries, info); _AddNewEntry(toIter->entries, info);
// done // done
return; return;
@@ -325,8 +325,8 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// The add-on was renamed, or moved within our hierarchy. // The add-on was renamed, or moved within our hierarchy.
EntryList::iterator eiter = from_iter->entries.begin(); EntryList::iterator eiter = fromIter->entries.begin();
if (_FindEntry(entryNodeRef, from_iter->entries, eiter)) { if (_FindEntry(entryNodeRef, fromIter->entries, eiter)) {
// save the old info and remove the entry // save the old info and remove the entry
info = *eiter; info = *eiter;
} else { } else {
@@ -344,18 +344,18 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// the entry and readding it. TODO: This can temporarily enable add-ons // the entry and readding it. TODO: This can temporarily enable add-ons
// which should in fact stay hidden (moving add-on from home to common // which should in fact stay hidden (moving add-on from home to common
// folder or vice versa, the system add-on should remain hidden). // folder or vice versa, the system add-on should remain hidden).
EntryRemoved(name, from_directory, device, node); EntryRemoved(name, fromDirectory, device, node);
info.dir_nref = toNodeRef; info.dir_nref = toNodeRef;
_EntryCreated(info); _EntryCreated(info);
} else { } else {
// Erase the entry // Erase the entry
from_iter->entries.erase(eiter); fromIter->entries.erase(eiter);
// check to see if it was formerly enabled // check to see if it was formerly enabled
bool wasEnabled = true; bool wasEnabled = true;
DirectoryList::iterator old_iter = fDirectories.begin(); DirectoryList::iterator oldIter = fDirectories.begin();
for (; old_iter != from_iter; old_iter++) { for (; oldIter != fromIter; oldIter++) {
if (_HasEntry(info.name, old_iter->entries)) { if (_HasEntry(info.name, oldIter->entries)) {
wasEnabled = false; wasEnabled = false;
break; break;
} }
@@ -365,9 +365,9 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// exists. // exists.
if (wasEnabled) { if (wasEnabled) {
AddOnDisabled(&info); AddOnDisabled(&info);
for (; old_iter != fDirectories.end(); old_iter++) { for (; oldIter != fDirectories.end(); oldIter++) {
eiter = old_iter->entries.begin(); eiter = oldIter->entries.begin();
if (_FindEntry(info.name, old_iter->entries, eiter)) { if (_FindEntry(info.name, oldIter->entries, eiter)) {
AddOnEnabled(&*eiter); AddOnEnabled(&*eiter);
break; break;
} }
@@ -386,9 +386,9 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// check to see if we are newly enabled // check to see if we are newly enabled
bool isEnabled = true; bool isEnabled = true;
DirectoryList::iterator new_iter = fDirectories.begin(); DirectoryList::iterator newIter = fDirectories.begin();
for (; new_iter != to_iter; new_iter++) { for (; newIter != toIter; newIter++) {
if (_HasEntry(info.name, new_iter->entries)) { if (_HasEntry(info.name, newIter->entries)) {
isEnabled = false; isEnabled = false;
break; break;
} }
@@ -397,9 +397,9 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
// if it is newly enabled, check under us for an enabled one, and // if it is newly enabled, check under us for an enabled one, and
// disable that first // disable that first
if (isEnabled) { if (isEnabled) {
for (; new_iter != fDirectories.end(); new_iter++) { for (; newIter != fDirectories.end(); newIter++) {
eiter = new_iter->entries.begin(); eiter = newIter->entries.begin();
if (_FindEntry(info.name, new_iter->entries, eiter)) { if (_FindEntry(info.name, newIter->entries, eiter)) {
AddOnDisabled(&*eiter); AddOnDisabled(&*eiter);
break; break;
} }
@@ -407,7 +407,7 @@ AddOnMonitorHandler::EntryMoved(const char *name, const char *fromName,
AddOnEnabled(&info); AddOnEnabled(&info);
} }
// put the new entry into the target directory // put the new entry into the target directory
to_iter->entries.push_back(info); toIter->entries.push_back(info);
} }
} }
src/kits/storage/NodeMonitorHandler.cpp
+6 -6
View File
@@ -102,7 +102,7 @@ NodeMonitorHandler::EntryRemoved(const char *name, ino_t directory,
/* virtual */ void /* virtual */ void
NodeMonitorHandler::EntryMoved(const char *name, const char *fromName, NodeMonitorHandler::EntryMoved(const char *name, const char *fromName,
ino_t from_directory, ino_t to_directory, dev_t device,ino_t node, ino_t fromDirectory, ino_t toDirectory, dev_t device,ino_t node,
dev_t nodeDevice) dev_t nodeDevice)
{ {
// ignore // ignore
@@ -183,21 +183,21 @@ NodeMonitorHandler::HandleEntryMoved(BMessage * msg)
{ {
const char *name; const char *name;
const char *fromName; const char *fromName;
ino_t from_directory; ino_t fromDirectory;
ino_t to_directory; ino_t toDirectory;
dev_t device; dev_t device;
ino_t node; ino_t node;
dev_t deviceNode; dev_t deviceNode;
if ((msg->FindString("name", &name) != B_OK) || if ((msg->FindString("name", &name) != B_OK) ||
(msg->FindString("from name", &fromName) != B_OK) || (msg->FindString("from name", &fromName) != B_OK) ||
(msg->FindInt64("from directory", &from_directory) != B_OK) || (msg->FindInt64("from directory", &fromDirectory) != B_OK) ||
(msg->FindInt64("to directory", &to_directory) != B_OK) || (msg->FindInt64("to directory", &toDirectory) != B_OK) ||
(msg->FindInt32("device", &device) != B_OK) || (msg->FindInt32("device", &device) != B_OK) ||
(msg->FindInt32("node device", &deviceNode) != B_OK) || (msg->FindInt32("node device", &deviceNode) != B_OK) ||
(msg->FindInt64("node", &node) != B_OK)) { (msg->FindInt64("node", &node) != B_OK)) {
return B_MESSAGE_NOT_UNDERSTOOD; return B_MESSAGE_NOT_UNDERSTOOD;
} }
EntryMoved(name, fromName, from_directory, to_directory, device, node, EntryMoved(name, fromName, fromDirectory, toDirectory, device, node,
deviceNode); deviceNode);
return B_OK; return B_OK;
} }