Mailinglist Archive: yast-commit (650 mails)

[aschnell@xxxxxxxxxxxxxxxx]

Author: aschnell
Date: Wed Feb 25 18:33:06 2009
New Revision: 55759

URL: http://svn.opensuse.org/viewcvs/yast?rev=55759&view=rev
Log:
- use SystemCmd.{stdout,stderr} instead of SystemCmd.getString

Modified:
    trunk/storage/libstorage/src/Disk.cc
    trunk/storage/libstorage/src/Storage.cc
    trunk/storage/libstorage/src/SystemCmd.h

Modified: trunk/storage/libstorage/src/Disk.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=55759&r1=55758&r2=55759&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Disk.cc (original)
+++ trunk/storage/libstorage/src/Disk.cc Wed Feb 25 18:33:06 2009
@@ -534,8 +534,8 @@
 int
 Disk::checkSystemError( const string& cmd_line, const SystemCmd& cmd )
     {
-    string tmp = *cmd.getString(SystemCmd::IDX_STDERR);
-    if( tmp.length()>0 )
+    string tmp = cmd.stderr();
+    if (!tmp.empty())
         {
        y2err("cmd:" << cmd_line);
        y2err("err:" << tmp);
@@ -545,8 +545,8 @@
            }
        system_stderr += tmp;
         }
-    tmp = *cmd.getString(SystemCmd::IDX_STDOUT);
-    if( tmp.length()>0 )
+    tmp = cmd.stdout();
+    if (!tmp.empty())
         {
        y2mil("cmd:" << cmd_line);
        y2mil("out:" << tmp);

Modified: trunk/storage/libstorage/src/Storage.cc
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=55759&r1=55758&r2=55759&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.cc (original)
+++ trunk/storage/libstorage/src/Storage.cc Wed Feb 25 18:33:06 2009
@@ -5444,14 +5444,12 @@
                    SystemCmd c("/usr/sbin/ntfsresize -f -i " + quote(device));
                    string fstr = " might resize at ";
                    string::size_type pos;
-                   if( c.retcode()==0 &&
-                       (pos=c.getString()->find( fstr ))!=string::npos )
+                   if (c.retcode()==0 && 
(pos=c.stdout().find(fstr))!=string::npos)
                        {
                        y2mil("pos:" << pos);
-                       pos = c.getString()->find_first_not_of( " \t\n", 
pos+fstr.size());
+                       pos = c.stdout().find_first_not_of(" \t\n", pos + 
fstr.size());
                        y2mil("pos:" << pos);
-                       string number = c.getString()->substr( pos,
-                                                              
c.getString()->find_first_not_of( "0123456789", pos ));
+                       string number = c.stdout().substr(pos, 
c.stdout().find_first_not_of("0123456789", pos));
                        y2mil("number:\"" << number << "\"");
                        unsigned long long t;
                        number >> t;

Modified: trunk/storage/libstorage/src/SystemCmd.h
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd.h?rev=55759&r1=55758&r2=55759&view=diff
==============================================================================
--- trunk/storage/libstorage/src/SystemCmd.h (original)
+++ trunk/storage/libstorage/src/SystemCmd.h Wed Feb 25 18:33:06 2009
@@ -39,7 +39,6 @@
        const string& stderr() const { return( *getString(IDX_STDERR)); }
        const string& stdout() const { return( *getString(IDX_STDOUT)); }
        const string& cmd() const { return( lastCmd ); }
-       const string* getString( unsigned Idx_ii=IDX_STDOUT ) const;
        const string* getLine( unsigned Num_iv, bool Selected_bv=false,
                               unsigned Idx_ii=IDX_STDOUT ) const;
        unsigned numLines( bool Selected_bv=false, unsigned Idx_ii=IDX_STDOUT ) 
const;
@@ -72,6 +71,8 @@
        void addLine( string Text_Cv, std::vector<string>& Lines_Cr );
        void init();
 
+       const string* getString( unsigned Idx_ii=IDX_STDOUT ) const;
+
        mutable string Text_aC[2];
        mutable bool Valid_ab[2];
        FILE* File_aC[2];

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx