Every file in this commit makes a call to a function which returns a value.

Each file also didn't check the return value.

This commit changes it so that every single non-checked call in these files
is checked.

7 files changed, 31 insertions, 30 deletions

diff --git a/noncore/apps/opie-console/filereceive.cpp b/noncore/apps/opie-console/filereceive.cpp
index 452be60..41e6888 100644
--- a/noncore/apps/opie-console/filereceive.cpp
+++ b/noncore/apps/opie-console/filereceive.cpp
@@ -4,4 +4,5 @@
 #include <errno.h>
 
+#include <opie2/odebug.h>
 #include <qsocketnotifier.h>
 
@@ -149,5 +150,6 @@ void FileReceive::slotRead() {
 void FileReceive::slotExec() {
     char buf[2];
-    ::read(m_term[0], buf, 1 );
+    if (::read(m_term[0], buf, 1 ) == -1)
+        owarn << "read of m_term[0] failed" << oendl;
     delete m_proc;
     delete m_not;
diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp
index 7eebc65..6e2d2d5 100644
--- a/noncore/apps/opie-console/filetransfer.cpp
+++ b/noncore/apps/opie-console/filetransfer.cpp
@@ -5,4 +5,5 @@
 #include <unistd.h>
 
+#include <opie2/odebug.h>
 #include <qsocketnotifier.h>
 
@@ -235,5 +236,6 @@ void FileTransfer::cancel() {
 void FileTransfer::slotExec() {
     char buf[2];
-    ::read(m_term[0], buf, 1 );
+    if (::read(m_term[0], buf, 1 ) == -1)
+        owarn << "read of m_term[0] failed" << oendl;
     delete m_proc;
     delete m_not;
diff --git a/noncore/apps/opie-console/logger.cpp b/noncore/apps/opie-console/logger.cpp
index 6620faf..0fdeca0 100644
--- a/noncore/apps/opie-console/logger.cpp
+++ b/noncore/apps/opie-console/logger.cpp
@@ -1,4 +1,5 @@
 #include <qfile.h>
 #include <qtextstream.h>
+#include <opie2/odebug.h>
 
 #include "logger.h"
@@ -9,5 +10,6 @@ Logger::Logger() {}
 Logger::Logger(const QString fileName) {
         m_file.setName(fileName);
-        m_file.open(IO_ReadWrite);
+        if ( !m_file.open(IO_ReadWrite) )
+            owarn << "failed to open " << m_file.name() << oendl;
 }
 
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 18c0434..aba7244 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -825,5 +825,6 @@ void MainWindow::slotSaveHistory() {
 
     QFile file(filename);
-    file.open(IO_WriteOnly );
+    if ( !file.open(IO_WriteOnly ) ) return;
+
     QTextStream str(&file );
     if ( currentSession() )
diff --git a/noncore/apps/opie-console/script.cpp b/noncore/apps/opie-console/script.cpp
index faea412..8d35776 100644
--- a/noncore/apps/opie-console/script.cpp
+++ b/noncore/apps/opie-console/script.cpp
@@ -7,5 +7,6 @@ Script::Script() {
 Script::Script(const QString fileName) {
     QFile file(fileName);
-    file.open(IO_ReadOnly );
+    if ( !file.open(IO_ReadOnly ) )
+        return;
     m_script = file.readAll();
 }
@@ -13,5 +14,6 @@ Script::Script(const QString fileName) {
 void Script::saveTo(const QString fileName) const {
     QFile file(fileName);
-    file.open(IO_WriteOnly);
+    if ( !file.open(IO_WriteOnly) )
+        return;
     file.writeBlock(m_script);
     file.close();
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 733db17..8b02f9f 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -846,11 +846,7 @@ bool Gutenbrowser::load( const char *fileName) {
 
 void Gutenbrowser::Search() {
-
-                        //    if( searchDlg->isHidden())
-                {
                                 odebug << "Starting search dialog" << oendl;
                                 searchDlg = new SearchDialog( this, "Etext Search", true);
                                 searchDlg->setCaption( tr( "Etext Search" ));
-                                        //        searchDlg->setLabel( "- searches etext");
                                 connect( searchDlg,SIGNAL( search_signal()),this,SLOT( search_slot()));
                                 connect( searchDlg,SIGNAL( search_done_signal()),this,SLOT( searchdone_slot()));
@@ -860,6 +856,4 @@ void Gutenbrowser::Search() {
                                 Lview->deselect();
                                 searchDlg->show();
-                                searchDlg->result();
-                }
 }
 
diff --git a/noncore/apps/opie-gutenbrowser/helpwindow.cpp b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
index 4bdac02..f444a2e 100644
--- a/noncore/apps/opie-gutenbrowser/helpwindow.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpwindow.cpp
@@ -197,8 +197,9 @@ HelpWindow::~HelpWindow()
 
     QFile f( QDir::currentDirPath() + "/.history" );
-    f.open( IO_WriteOnly );
+    if ( f.open( IO_WriteOnly ) ) {
     QDataStream s( &f );
     s << history;
     f.close();
+    }
 
     bookmarks.clear();
@@ -208,5 +209,7 @@ HelpWindow::~HelpWindow()
 
     QFile f2( QDir::currentDirPath() + "/.bookmarks" );
-    f2.open( IO_WriteOnly );
+    if ( !f2.open( IO_WriteOnly ) )
+        return;
+
     QDataStream s2( &f2 );
     s2 << bookmarks;
@@ -214,14 +217,4 @@ HelpWindow::~HelpWindow()
 }
 
-//  void HelpWindow::about()
-//  {
-//      QMessageBox::about( this, "Gutenbrowser", "<p>Thanks to Trolltech for this</p>" );
-//  }
-
-//  void HelpWindow::aboutQt()
-//  {
-//      QMessageBox::aboutQt( this, "QBrowser" );
-//  }
-
 void HelpWindow::openFile()
 {
@@ -293,7 +286,11 @@ void HelpWindow::pathSelected( const QString &_path )
 void HelpWindow::readHistory()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.history" ) ) {
+    if ( !QFile::exists( QDir::currentDirPath() + "/.history" ) )
+        return;
+
   QFile f( QDir::currentDirPath() + "/.history" );
-  f.open( IO_ReadOnly );
+    if ( !f.open( IO_ReadOnly ) )
+        return;
+
   QDataStream s( &f );
   s >> history;
@@ -302,16 +299,17 @@ void HelpWindow::readHistory()
       history.remove( history.begin() );
     }
-}
 
 void HelpWindow::readBookmarks()
 {
-    if ( QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) ) {
+    if ( !QFile::exists( QDir::currentDirPath() + "/.bookmarks" ) )
+        return;
+
   QFile f( QDir::currentDirPath() + "/.bookmarks" );
-  f.open( IO_ReadOnly );
+    if ( !f.open( IO_ReadOnly ) )
+        return;
   QDataStream s( &f );
   s >> bookmarks;
   f.close();
     }
-}
 
 void HelpWindow::histChosen( int i )