Author: aschnell Date: Sat Jul 26 18:06:28 2008 New Revision: 49435 URL: http://svn.opensuse.org/viewcvs/yast?rev=49435&view=rev Log: - fixed macro Modified: trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/PeContainer.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h?rev=49435&r1=49434&r2=49435&view=diff ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Sat Jul 26 18:06:28 2008 @@ -72,12 +72,12 @@ #define y2war(op) log_op( 2, __FILE__, __LINE__, __FUNCTION__, NULL, op ) #define y2err(op) log_op( 3, __FILE__, __LINE__, __FUNCTION__, NULL, op ) -#define log_op( level, file, line, function, add, op ) \ - { \ - std::ostringstream __buf; \ - __buf << op; \ - log_msg( level, file, line, function, add, "%s", __buf.str().c_str() ); \ - } +#define log_op(level, file, line, function, add, op) \ + do { \ + std::ostringstream __buf; \ + __buf << op; \ + log_msg(level, file, line, function, add, "%s", __buf.str().c_str()); \ + } while (0) string sformat(const char* format, ...); Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.cc?rev=49435&r1=49434&r2=49435&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Sat Jul 26 18:06:28 2008 @@ -330,9 +330,9 @@ if( i!=pp.end() ) ret = &(*i); if( ret ) - y2mil( "nr:" << nr << " del:" << del << " *p:" << *ret ) + y2mil( "nr:" << nr << " del:" << del << " *p:" << *ret ); else - y2mil( "nr:" << nr << " del:" << del << " p:NULL" ) + y2mil( "nr:" << nr << " del:" << del << " p:NULL" ); return( ret ); } @@ -345,7 +345,7 @@ while( i!=pp.end() && p != &(*i) ) ++i; ret = i!=pp.end(); - y2mil( "nr:" << p->nr() << " ret:" << ret ) + y2mil( "nr:" << p->nr() << " ret:" << ret ); return( ret ); } Modified: trunk/storage/libstorage/src/PeContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/PeContainer.cc?rev=49435&r1=49434&r2=49435&view=diff ============================================================================== --- trunk/storage/libstorage/src/PeContainer.cc (original) +++ trunk/storage/libstorage/src/PeContainer.cc Sat Jul 26 18:06:28 2008 @@ -328,7 +328,7 @@ bool PeContainer::checkCreateConstraints() { - y2mil( "peContainer:" << *this ) + y2mil( "peContainer:" << *this ); int ret = false; unsigned long increase = 0; unsigned long current = 0; @@ -337,14 +337,14 @@ DmPair lp=dmPair(); DmIter i=lp.begin(); if( pv_add.size()>0 ) - y2war( "should not happen pv_add:" << pv_add ) + y2war( "should not happen pv_add:" << pv_add ); if( pv_remove.size()>0 ) - y2war( "should not happen pv_rem:" << pv_remove ) + y2war( "should not happen pv_rem:" << pv_remove ); while( i!=lp.end() ) { unsigned long long tmp; if( i->deleted() || i->needShrink() ) - y2war( "should not happen dm:" << *i ) + y2war( "should not happen dm:" << *i ); else if( i->created() || i->extendSize()>0 ) { tmp = sizeToLe(i->created() ? i->sizeK() : i->extendSize()); @@ -353,7 +353,7 @@ li.push_back( make_pair(tmp,&(*i)) ); increase += tmp; y2mil( "inc:" << tmp << " sum:" << increase ); - y2mil( "vol:" << *i ) + y2mil( "vol:" << *i ); } else current += sizeToLe( i->sizeK() ); Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=49435&r1=49434&r2=49435&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Sat Jul 26 18:06:28 2008 @@ -4694,7 +4694,7 @@ } } y2mil( "dev:" << dev << " ret:" << ret << " cn:" << info.cname << - " vn:" << info.vname ) + " vn:" << info.vname ); if( info.numeric ) y2mil( "nr:" << info.nr ); return( ret ); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=49435&r1=49434&r2=49435&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Sat Jul 26 18:06:28 2008 @@ -133,7 +133,7 @@ if( ret && encryption != ENC_NONE && (mby==MOUNTBY_UUID || mby==MOUNTBY_LABEL) ) ret = false; - y2mil( "mby:" << mb_names[mby] << " mp:" << mp << " ret:" << ret ) + y2mil( "mby:" << mb_names[mby] << " mp:" << mp << " ret:" << ret ); return( ret ); } @@ -2410,7 +2410,7 @@ (cont->type()==LOOP && getLoopFile(fname) && fstab->findDevice( fname, entry ))) { - y2mil( "changed:" << entry ) + y2mil( "changed:" << entry ); FstabChange che( entry ); string de = getFstabDentry(); if( orig_mp!=mp ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org