[haiku-commits] r39027 - in haiku/trunk: headers/private/storage src/kits/storage
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 20 Oct 2010 21:09:25 +0200 (CEST)
Author: czeidler
Date: 2010-10-20 21:09:25 +0200 (Wed, 20 Oct 2010)
New Revision: 39027
Changeset: http://dev.haiku-os.org/changeset/39027
Modified:
haiku/trunk/headers/private/storage/AddOnMonitorHandler.h
haiku/trunk/headers/private/storage/NodeMonitorHandler.h
haiku/trunk/src/kits/storage/AddOnMonitorHandler.cpp
haiku/trunk/src/kits/storage/NodeMonitorHandler.cpp
Log:
Fix coding style, thanks Axel.
Modified: haiku/trunk/headers/private/storage/AddOnMonitorHandler.h
===================================================================
--- haiku/trunk/headers/private/storage/AddOnMonitorHandler.h 2010-10-20
19:08:00 UTC (rev 39026)
+++ haiku/trunk/headers/private/storage/AddOnMonitorHandler.h 2010-10-20
19:09:25 UTC (rev 39027)
@@ -64,8 +64,8 @@
virtual void EntryRemoved(const char *name,
ino_t directory,
dev_t
device, ino_t node);
virtual void EntryMoved(const char *name,
- const
char *fromName, ino_t from_directory,
- ino_t
to_directory, dev_t device,
+ const
char *fromName, ino_t fromDirectory,
+ ino_t
toDirectory, dev_t device,
ino_t
node, dev_t nodeDevice);
virtual void StatChanged(ino_t node, dev_t
device);
Modified: haiku/trunk/headers/private/storage/NodeMonitorHandler.h
===================================================================
--- haiku/trunk/headers/private/storage/NodeMonitorHandler.h 2010-10-20
19:08:00 UTC (rev 39026)
+++ haiku/trunk/headers/private/storage/NodeMonitorHandler.h 2010-10-20
19:09:25 UTC (rev 39027)
@@ -31,7 +31,7 @@
virtual void EntryRemoved(const char *name, ino_t directory,
dev_t device, ino_t node);
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);
virtual void StatChanged(ino_t node, dev_t device);
virtual void AttrChanged(ino_t node, dev_t device);
Modified: haiku/trunk/src/kits/storage/AddOnMonitorHandler.cpp
===================================================================
--- haiku/trunk/src/kits/storage/AddOnMonitorHandler.cpp 2010-10-20
19:08:00 UTC (rev 39026)
+++ haiku/trunk/src/kits/storage/AddOnMonitorHandler.cpp 2010-10-20
19:09:25 UTC (rev 39027)
@@ -214,19 +214,19 @@
void
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)
{
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
- DirectoryList::iterator from_iter = fDirectories.begin();
- bool watchingFromDirectory = _FindDirectory(from_directory, device,
- from_iter);
+ DirectoryList::iterator fromIter = fDirectories.begin();
+ bool watchingFromDirectory = _FindDirectory(fromDirectory, device,
+ fromIter);
- DirectoryList::iterator to_iter = fDirectories.begin();
- bool watchingToDirectory = _FindDirectory(toNodeRef, to_iter);
+ DirectoryList::iterator toIter = fDirectories.begin();
+ bool watchingToDirectory = _FindDirectory(toNodeRef, toIter);
if (!watchingFromDirectory && !watchingToDirectory) {
// It seems the notification was for a directory we are not
@@ -241,8 +241,8 @@
if (!watchingToDirectory) {
// moved out of our view
- EntryList::iterator eiter = from_iter->entries.begin();
- if (!_FindEntry(entryNodeRef, from_iter->entries, eiter)) {
+ EntryList::iterator eiter = fromIter->entries.begin();
+ if (!_FindEntry(entryNodeRef, fromIter->entries, eiter)) {
// we don't know anything about this entry yet.. ignore
it
return;
}
@@ -250,13 +250,13 @@
// save the info and remove the entry
info = *eiter;
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.
// If we find a add-on with the same name then the moved add-on
// was not enabled. So we are done.
DirectoryList::iterator diter = fDirectories.begin();
- for (; diter != from_iter; diter++) {
+ for (; diter != fromIter; diter++) {
eiter = diter->entries.begin();
if (_FindEntry(info.name, diter->entries, eiter))
return;
@@ -267,9 +267,9 @@
// Continue searching for a add-on below us. If we find a
add-on
// with the same name, we must enable it.
- for (from_iter++; from_iter != fDirectories.end(); from_iter++)
{
- eiter = from_iter->entries.begin();
- if (_FindEntry(info.name, from_iter->entries, eiter)) {
+ for (fromIter++; fromIter != fDirectories.end(); fromIter++) {
+ eiter = fromIter->entries.begin();
+ if (_FindEntry(info.name, fromIter->entries, eiter)) {
AddOnEnabled(&*eiter);
return;
}
@@ -296,7 +296,7 @@
// If we find an add-on with the same name then the moved add-on
// is not to be enabled. So we are done.
DirectoryList::iterator diter = fDirectories.begin();
- for (; diter != to_iter; diter++) {
+ for (; diter != toIter; diter++) {
if (_HasEntry(info.name, diter->entries)) {
// The new add-on is being shadowed.
return;
@@ -317,7 +317,7 @@
AddOnEnabled(&info);
// put the new entry into the target directory
- _AddNewEntry(to_iter->entries, info);
+ _AddNewEntry(toIter->entries, info);
// done
return;
@@ -325,8 +325,8 @@
// The add-on was renamed, or moved within our hierarchy.
- EntryList::iterator eiter = from_iter->entries.begin();
- if (_FindEntry(entryNodeRef, from_iter->entries, eiter)) {
+ EntryList::iterator eiter = fromIter->entries.begin();
+ if (_FindEntry(entryNodeRef, fromIter->entries, eiter)) {
// save the old info and remove the entry
info = *eiter;
} else {
@@ -344,18 +344,18 @@
// 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
// 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;
_EntryCreated(info);
} else {
// Erase the entry
- from_iter->entries.erase(eiter);
+ fromIter->entries.erase(eiter);
// check to see if it was formerly enabled
bool wasEnabled = true;
- DirectoryList::iterator old_iter = fDirectories.begin();
- for (; old_iter != from_iter; old_iter++) {
- if (_HasEntry(info.name, old_iter->entries)) {
+ DirectoryList::iterator oldIter = fDirectories.begin();
+ for (; oldIter != fromIter; oldIter++) {
+ if (_HasEntry(info.name, oldIter->entries)) {
wasEnabled = false;
break;
}
@@ -365,9 +365,9 @@
// exists.
if (wasEnabled) {
AddOnDisabled(&info);
- for (; old_iter != fDirectories.end(); old_iter++) {
- eiter = old_iter->entries.begin();
- if (_FindEntry(info.name, old_iter->entries,
eiter)) {
+ for (; oldIter != fDirectories.end(); oldIter++) {
+ eiter = oldIter->entries.begin();
+ if (_FindEntry(info.name, oldIter->entries,
eiter)) {
AddOnEnabled(&*eiter);
break;
}
@@ -386,9 +386,9 @@
// check to see if we are newly enabled
bool isEnabled = true;
- DirectoryList::iterator new_iter = fDirectories.begin();
- for (; new_iter != to_iter; new_iter++) {
- if (_HasEntry(info.name, new_iter->entries)) {
+ DirectoryList::iterator newIter = fDirectories.begin();
+ for (; newIter != toIter; newIter++) {
+ if (_HasEntry(info.name, newIter->entries)) {
isEnabled = false;
break;
}
@@ -397,9 +397,9 @@
// if it is newly enabled, check under us for an enabled one,
and
// disable that first
if (isEnabled) {
- for (; new_iter != fDirectories.end(); new_iter++) {
- eiter = new_iter->entries.begin();
- if (_FindEntry(info.name, new_iter->entries,
eiter)) {
+ for (; newIter != fDirectories.end(); newIter++) {
+ eiter = newIter->entries.begin();
+ if (_FindEntry(info.name, newIter->entries,
eiter)) {
AddOnDisabled(&*eiter);
break;
}
@@ -407,7 +407,7 @@
AddOnEnabled(&info);
}
// put the new entry into the target directory
- to_iter->entries.push_back(info);
+ toIter->entries.push_back(info);
}
}
Modified: haiku/trunk/src/kits/storage/NodeMonitorHandler.cpp
===================================================================
--- haiku/trunk/src/kits/storage/NodeMonitorHandler.cpp 2010-10-20 19:08:00 UTC
(rev 39026)
+++ haiku/trunk/src/kits/storage/NodeMonitorHandler.cpp 2010-10-20 19:09:25 UTC
(rev 39027)
@@ -102,7 +102,7 @@
/* virtual */ void
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)
{
// ignore
@@ -183,21 +183,21 @@
{
const char *name;
const char *fromName;
- ino_t from_directory;
- ino_t to_directory;
+ ino_t fromDirectory;
+ ino_t toDirectory;
dev_t device;
ino_t node;
dev_t deviceNode;
if ((msg->FindString("name", &name) != B_OK) ||
(msg->FindString("from name", &fromName) != B_OK) ||
- (msg->FindInt64("from directory", &from_directory) != B_OK) ||
- (msg->FindInt64("to directory", &to_directory) != B_OK) ||
+ (msg->FindInt64("from directory", &fromDirectory) != B_OK) ||
+ (msg->FindInt64("to directory", &toDirectory) != B_OK) ||
(msg->FindInt32("device", &device) != B_OK) ||
(msg->FindInt32("node device", &deviceNode) != B_OK) ||
(msg->FindInt64("node", &node) != B_OK)) {
return B_MESSAGE_NOT_UNDERSTOOD;
}
- EntryMoved(name, fromName, from_directory, to_directory, device, node,
+ EntryMoved(name, fromName, fromDirectory, toDirectory, device, node,
deviceNode);
return B_OK;
}
Other related posts:
- » [haiku-commits] r39027 - in haiku/trunk: headers/private/storage src/kits/storage - clemens . zeidler
