Author: aschnell
Date: Mon Nov 10 18:11:13 2008
New Revision: 53149
URL: http://svn.opensuse.org/viewcvs/yast?rev=53149&view=rev
Log:
- removed some unused bsd partition detection code
Modified:
trunk/storage/libstorage/src/Disk.cc
trunk/storage/libstorage/src/Disk.h
Modified: trunk/storage/libstorage/src/Disk.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=53149&r1=53148&r2=53149&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Disk.cc (original)
+++ trunk/storage/libstorage/src/Disk.cc Mon Nov 10 18:11:13 2008
@@ -875,9 +875,11 @@
return( true );
}
-bool Disk::checkPartedValid( const ProcPart& pp, const string& diskname,
- list& pl, unsigned long& range_exceed )
- {
+
+bool
+Disk::checkPartedValid(const ProcPart& pp, const string& diskname,
+ list& pl, unsigned long& range_exceed)
+{
unsigned ext_nr = 0;
bool ret=true;
unsigned long Dummy;
@@ -909,7 +911,6 @@
proc_l[p.second] = kbToCylinder( SizeK );
}
}
- bool openbsd = false;
y2mil( "proc :" << proc_l );
y2mil( "parted:" << parted_l );
if( proc_l.size()>=parted_l.size() && !parted_l.empty() )
@@ -984,26 +985,10 @@
}
}
}
- y2milestone("haveBsd:%d pr.size:%zd pa.size:%zd", openbsd,
- proc_l.size(), parted_l.size() );
- y2milestone( "ret:%d", ret );
- return( ret );
- }
-
-static bool isBsdPart( const Partition& p )
- { return( p.id()==0xa5 || p.id()==0xa6 || p.id()==0xeb ); }
-
-bool Disk::haveBsdPart(const list& pl) const
- {
- bool ret = false;
- list::const_iterator i = pl.begin();
- while( !ret && i!=pl.end() )
- {
- ret = isBsdPart(**i);
- ++i;
- }
- return( ret );
- }
+ y2mil("pr.size:" << proc_l.size() << " pa.size:" << parted_l.size());
+ y2mil("ret:" << ret);
+ return ret;
+}
// note: factors are in the context of kilo
Modified: trunk/storage/libstorage/src/Disk.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?rev=53149&r1=53148&r2=53149&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Disk.h (original)
+++ trunk/storage/libstorage/src/Disk.h Mon Nov 10 18:11:13 2008
@@ -200,7 +200,6 @@
virtual int doCreateLabel();
void logData( const string& Dir );
- bool haveBsdPart( const std::list& pl) const;
void setLabelData( const string& );
static string defaultLabel( const Storage&, unsigned long long size_k );
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
