fix build warnings rs=sspitzer

db/mork/src/morkAtom.cpp

@@ -395,7 +395,10 @@ morkBookAtom::HashFormAndBody(morkEnv* ev) const
     body = ((const morkFarBookAtom*) this)->mFarBookAtom_Body;
   }
   else
+  {
     this->NonBookAtomTypeError(ev);
+    return 0;
+  }
   
   const mork_u1* end = body + size;
   while ( body < end )
@@ -442,7 +445,10 @@ morkBookAtom::EqualFormAndBody(morkEnv* ev, const morkBookAtom* inAtom) const
     form = ((const morkFarBookAtom*) inAtom)->mFarBookAtom_Form;
   }
   else
+  {
     inAtom->NonBookAtomTypeError(ev);
+    return morkBool_kFalse;
+  }
 
   const mork_u1* thisBody = 0; // body of bytes in this to compare
   mork_size thisSize; // the number of bytes in this to compare

db/mork/src/morkCellObject.cpp

@@ -72,10 +72,6 @@
 #include "morkCell.h"
 #endif
 
-#ifndef _ORKINCELL_
-#include "orkinCell.h"
-#endif
-
 #ifndef _MORKSTORE_
 #include "morkStore.h"
 #endif

db/mork/src/morkEnv.cpp

@@ -56,10 +56,6 @@
 #include "morkEnv.h"
 #endif
 
-#ifndef _ORKINENV_
-#include "orkinEnv.h"
-#endif
-
 #ifndef _MORKFACTORY_
 #include "morkFactory.h"
 #endif

db/mork/src/morkFactory.cpp

@@ -60,10 +60,6 @@
 #include "morkFactory.h"
 #endif
 
-#ifndef _ORKINFACTORY_
-#include "orkinFactory.h"
-#endif
-
 #ifndef _ORKINHEAP_
 #include "orkinHeap.h"
 #endif
@@ -217,7 +213,6 @@ morkFactory::OpenOldFile(nsIMdbEnv* mev, nsIMdbHeap* ioHeap,
   // other portions or Mork source code don't want to know how it's done.
 {
   mdb_err outErr = 0;
-  nsIMdbFile* outFile = 0;
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   morkFile* file = nsnull;
   if ( ev )
@@ -247,7 +242,6 @@ morkFactory::CreateNewFile(nsIMdbEnv* mev, nsIMdbHeap* ioHeap,
   // other portions or Mork source code don't want to know how it's done.
 {
   mdb_err outErr = 0;
-  nsIMdbFile* outFile = 0;
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   morkFile* file = nsnull;
   if ( ev )

db/mork/src/morkFile.cpp

@@ -56,7 +56,7 @@
 #include "morkFile.h"
 #endif
 
-#define MORK_CONFIG_USE_ORKINFILE 1
+// #define MORK_CONFIG_USE_ORKINFILE 1
  
 #ifdef MORK_CONFIG_USE_ORKINFILE
 #ifndef _ORKINFILE_

db/mork/src/morkNode.cpp

@@ -428,7 +428,6 @@ nsIMdbFile_SlotStrongFile(nsIMdbFile* self, morkEnv* ev, nsIMdbFile** ioSlot)
   // then self is put into slot *ioSlot.  Note self can be nil, so we take
   // expression 'nsIMdbFile_SlotStrongFile(0, ev, &slot)'.
 {
-  nsIMdbEnv* menv = ev->AsMdbEnv();
   nsIMdbFile* file = *ioSlot;
   if ( self != file )
   {

db/mork/src/morkNode.h

@@ -234,15 +234,6 @@ public: // other morkNode methods
   mork_bool IsHeapNode() const
   { return mNode_Usage == morkUsage_kHeap; }
 
-  mork_bool IsStackNode() const
-  { return mNode_Usage == morkUsage_kStack; }
-
-  mork_bool IsGlobalNode() const
-  { return mNode_Usage == morkUsage_kGlobal; }
-
-  mork_bool IsMemberNode() const
-  { return mNode_Usage == morkUsage_kMember; }
-
   mork_bool IsOpenNode() const
   { return mNode_Access == morkAccess_kOpen; }
 

db/mork/src/morkParser.cpp

@@ -955,7 +955,6 @@ morkBuf* morkParser::ReadValue(morkEnv* ev)
 void morkParser::ReadDictForm(morkEnv *ev)
 {
   int nextChar;
-  morkStream* s = mParser_Stream;
   nextChar = this->NextChar(ev);
   if (nextChar == '(')
   {
@@ -995,7 +994,6 @@ void morkParser::ReadCellForm(morkEnv *ev, int c)
 {
   MORK_ASSERT (c == morkStore_kFormColumn);
   int nextChar;
-  morkStream* s = mParser_Stream;
   nextChar = this->NextChar(ev);
   int cellForm;
 

db/mork/src/morkPortTableCursor.cpp

@@ -60,10 +60,6 @@
 #include "morkPortTableCursor.h"
 #endif
 
-#ifndef _ORKINPORTTABLECURSOR_
-#include "orkinPortTableCursor.h"
-#endif
-
 #ifndef _MORKSTORE_
 #include "morkStore.h"
 #endif

db/mork/src/morkRowCellCursor.cpp

@@ -210,7 +210,6 @@ morkRowCellCursor::GetRow(nsIMdbEnv* mev, nsIMdbRow** acqRow)
 {
   mdb_err outErr = 0;
   nsIMdbRow* outRow = 0;
-  morkRow* row = 0;
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   if ( ev )
   {

db/mork/src/morkRowObject.cpp

@@ -56,10 +56,6 @@
 #include "morkEnv.h"
 #endif
 
-#ifndef _ORKINROW_
-#include "orkinRow.h"
-#endif
-
 #ifndef _MORKSTORE_
 #include "morkStore.h"
 #endif
@@ -72,8 +68,8 @@
 #include "morkCellObject.h"
 #endif
 
-#ifndef _ORKINROWCELLCURSOR_
-#include "orkinRowCellCursor.h"
+#ifndef _MORKROW_
+#include "morkRow.h"
 #endif
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789
@@ -314,11 +310,9 @@ morkRowObject::NewCell( // get cell for specified column, or add new one
   nsIMdbCell** acqCell)
 {
   mdb_err outErr = 0;
-  nsIMdbCell* outCell = 0;
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   if ( ev )
   {
-    mork_pos pos = 0;
     GetCell(mev, inColumn, acqCell);
     if ( !*acqCell )
     {
@@ -443,7 +437,6 @@ morkRowObject::AddRow( // add all cells in another row to this one
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   if ( ev )
   {
-    morkRow* source = 0;
     morkRow* unsafeSource = (morkRow*) ioSourceRow; // unsafe cast
 //    if ( unsafeSource->CanUseRow(mev, morkBool_kFalse, &outErr, &source) )
     {
@@ -463,7 +456,6 @@ morkRowObject::SetRow( // make exact duplicate of another row
   morkEnv* ev = morkEnv::FromMdbEnv(mev);
   if ( ev )
   {
-    morkRow* source = 0;
     morkRowObject *sourceObject = (morkRowObject *) ioSourceRow; // unsafe cast
     morkRow* unsafeSource = sourceObject->mRowObject_Row;
 //    if ( unsafeSource->CanUseRow(mev, morkBool_kFalse, &outErr, &source) )
@@ -662,7 +654,6 @@ morkRowObject::RowObjectRowNotSelfError(morkEnv* ev)
 nsIMdbRow*
 morkRowObject::AcquireRowHandle(morkEnv* ev) // mObject_Handle
 {
-  nsIMdbRow* outRow = 0;
   AddRef();
   return this;
 }

db/mork/src/morkStore.cpp

@@ -64,14 +64,6 @@
 #include "morkStore.h"
 #endif
 
-#ifndef _ORKINSTORE_
-#include "orkinStore.h"
-#endif
-
-#ifndef _ORKINTHUMB_
-#include "orkinThumb.h"
-#endif
-
 #ifndef _MORKFACTORY_
 #include "morkFactory.h"
 #endif
@@ -215,9 +207,9 @@ morkStore::morkStore(morkEnv* ev, const morkUsage& inUsage,
 
 , mStore_FirstCommitGroupPos( 0 )
 , mStore_SecondCommitGroupPos( 0 )
-, mPort_Heap( 0 )
 , mPort_Env( ev )
 , mPort_Factory( 0 )
+, mPort_Heap( 0 )
 
 // disable auto-assignment of atom IDs until someone knows it is okay:
 , mStore_CanAutoAssignAtomIdentity( morkBool_kFalse )
@@ -255,7 +247,7 @@ morkStore::CloseStore(morkEnv* ev) // called by CloseMorkNode();
     {
 
       nsIMdbFile* file = mStore_File;
-      nsrefcnt refCnt = file->AddRef();
+      file->AddRef();
 
       morkFactory::SlotWeakFactory((morkFactory*) 0, ev, &mPort_Factory);
       nsIMdbHeap_SlotStrongHeap((nsIMdbHeap*) 0, ev, &mPort_Heap);

db/mork/src/morkTable.cpp

@@ -76,10 +76,6 @@
 #include "morkRow.h"
 #endif
 
-#ifndef _ORKINTABLE_
-#include "orkinTable.h"
-#endif
-
 #ifndef _MORKTABLEROWCURSOR_
 #include "morkTableRowCursor.h"
 #endif
@@ -88,9 +84,6 @@
 #include "morkRowObject.h"
 #endif
 
-#ifndef _ORKINTABLEROWCURSOR_
-#include "orkinTableRowCursor.h"
-#endif
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789
 
 // ````` ````` ````` ````` `````