Author: aschnell
Date: Thu Sep 11 14:30:40 2008
New Revision: 51027
URL: http://svn.opensuse.org/viewcvs/yast?rev=51027&view=rev
Log:
- renamed functions
Modified:
trunk/storage/libstorage/src/AppUtil.cc
trunk/storage/libstorage/src/AppUtil.h
trunk/storage/libstorage/src/ProcMounts.cc
trunk/storage/libstorage/src/Storage.cc
Modified: trunk/storage/libstorage/src/AppUtil.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.cc?rev=51027&r1=51026&r2=51027&view=diff
==============================================================================
--- trunk/storage/libstorage/src/AppUtil.cc (original)
+++ trunk/storage/libstorage/src/AppUtil.cc Thu Sep 11 14:30:40 2008
@@ -459,7 +459,7 @@
void
-getFindMap(const char* path, map& m)
+getUdevMap(const char* path, map& m)
{
y2mil( "path: " << path );
@@ -474,7 +474,7 @@
void
-getFindRevMap(const char* path, map& m)
+getRevUdevMap(const char* path, map& m)
{
y2mil("path: " << path);
Modified: trunk/storage/libstorage/src/AppUtil.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h?rev=51027&r1=51026&r2=51027&view=diff
==============================================================================
--- trunk/storage/libstorage/src/AppUtil.h (original)
+++ trunk/storage/libstorage/src/AppUtil.h Thu Sep 11 14:30:40 2008
@@ -37,8 +37,8 @@
const string& delim = "=",
const string& removeSur = " \t\n" );
-void getFindMap(const char* path, std::map& m);
-void getFindRevMap(const char* path, std::map& m);
+void getUdevMap(const char* path, std::map& m);
+void getRevUdevMap(const char* path, std::map& m);
string normalizeDevice( const string& dev );
void normalizeDevice( string& dev );
Modified: trunk/storage/libstorage/src/ProcMounts.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMounts.cc?rev=51027&r1=51026&r2=51027&view=diff
==============================================================================
--- trunk/storage/libstorage/src/ProcMounts.cc (original)
+++ trunk/storage/libstorage/src/ProcMounts.cc Thu Sep 11 14:30:40 2008
@@ -19,8 +19,8 @@
{
map by_label;
map by_uuid;
- getFindRevMap( "/dev/disk/by-label", by_label );
- getFindRevMap( "/dev/disk/by-uuid", by_uuid );
+ getRevUdevMap("/dev/disk/by-label", by_label);
+ getRevUdevMap("/dev/disk/by-uuid", by_uuid);
ifstream mounts( "/proc/mounts" );
classic(mounts);
string line;
Modified: trunk/storage/libstorage/src/Storage.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=51027&r1=51026&r2=51027&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.cc (original)
+++ trunk/storage/libstorage/src/Storage.cc Thu Sep 11 14:30:40 2008
@@ -496,7 +496,7 @@
DmraidCo::getRaids( l );
map by_id;
if( !l.empty() )
- getFindMap("/dev/disk/by-id", by_id);
+ getUdevMap("/dev/disk/by-id", by_id);
for( list<string>::const_iterator i=l.begin(); i!=l.end(); ++i )
{
DmraidCo * v = new DmraidCo( this, *i, ppart );
@@ -537,7 +537,7 @@
DmmultipathCo::getMultipaths( l );
map by_id;
if( !l.empty() )
- getFindMap("/dev/disk/by-id", by_id);
+ getUdevMap("/dev/disk/by-id", by_id);
for( list<string>::const_iterator i=l.begin(); i!=l.end(); ++i )
{
DmmultipathCo * v = new DmmultipathCo( this, *i, ppart );
@@ -669,8 +669,8 @@
{
map by_path;
map by_id;
- getFindMap("/dev/disk/by-path", by_path);
- getFindMap("/dev/disk/by-id", by_id);
+ getUdevMap("/dev/disk/by-path", by_path);
+ getUdevMap("/dev/disk/by-id", by_id);
list<DiskData> dl;
while( (Entry=readdir( Dir ))!=NULL )
{
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
aschnell＠svn.opensuse.org