Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-09 08:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove several warnings

Browse Source
This commit is contained in:
sspitzer%netscape.com 1999-06-19 21:34:32 +00:00
parent af503350ec
commit 3f12c659bc
19 changed files with 96 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db/mork/src/mork.h
View File

@ -28,9 +28,10 @@
// { %%%%% begin disable unused param warnings %%%%%
#define MORK_USED_1(x) (void)(&x)
#define MORK_USED_2(x,y) (void)(&x,&y)
#define MORK_USED_3(x,y,z) (void)(&x,&y,&z)
#define MORK_USED_4(w,x,y,z) (void)(&w,&x,&y,&z)
#define MORK_USED_2(x,y) (void)(&x);(void)(&y);
#define MORK_USED_3(x,y,z) (void)(&x);(void)(&y);(void)(&z);
#define MORK_USED_4(w,x,y,z) (void)(&w);(void)(&x);(void)(&y);(void)(&z);
// } %%%%% end disable unused param warnings %%%%%
// { %%%%% begin macro for finding class member offset %%%%%

8
db/mork/src/morkBuilder.cpp
View File

@ -577,8 +577,8 @@ morkBuilder::AddBuilderCell(morkEnv* ev,
{
if ( mBuilder_CellsVecFill < morkBuilder_kCellsVecSize )
{
mork_fill index = mBuilder_CellsVecFill++;
outCell = mBuilder_CellsVec + index;
mork_fill indx = mBuilder_CellsVecFill++;
outCell = mBuilder_CellsVec + indx;
outCell->SetColumnAndChange(column, inChange);
outCell->mCell_Atom = 0;
}
@ -647,8 +647,8 @@ morkBuilder::OnNewCell(morkEnv* ev, const morkPlace& inPlace,
{
if ( mBuilder_CellsVecFill < morkBuilder_kCellsVecSize )
{
mork_fill index = mBuilder_CellsVecFill++;
morkCell* cell = mBuilder_CellsVec + index;
mork_fill indx = mBuilder_CellsVecFill++;
morkCell* cell = mBuilder_CellsVec + indx;
cell->SetColumnAndChange(column, inChange);
cell->mCell_Atom = 0;
mBuilder_Cell = cell;

2
db/mork/src/morkCell.h
View File

@ -42,7 +42,7 @@ public:
morkCell() : mCell_Delta( 0 ), mCell_Atom( 0 ) { }
morkCell(const morkCell& c)
: mCell_Atom( c.mCell_Atom ), mCell_Delta( c.mCell_Delta ) { }
: mCell_Delta( c.mCell_Delta ), mCell_Atom( c.mCell_Atom ) { }
// note if ioAtom is non-nil, caller needs to call ioAtom->AddCellUse():
morkCell(mork_column inCol, mork_change inChange, morkAtom* ioAtom)

9
db/mork/src/morkWriter.cpp
View File

@ -783,11 +783,11 @@ morkWriter::WriteAllStoreTables(morkEnv* ev)
morkTableMapIter* ti = &mWriter_RowSpaceTablesIter;
ti->InitTableMapIter(ev, &space->mRowSpace_Tables);
mork_tid* key = 0; // ignore keys in table map
mork_tid* key2 = 0; // ignore keys in table map
morkTable* table = 0; // old key row in the map
for ( c = ti->FirstTable(ev, key, &table); c && ev->Good();
c = ti->NextTable(ev, key, &table) )
for ( c = ti->FirstTable(ev, key2, &table); c && ev->Good();
c = ti->NextTable(ev, key2, &table) )
{
if ( table && table->IsTable() )
{
@ -1494,7 +1494,8 @@ morkWriter::PutRow(morkEnv* ev, morkRow* ioRow)
mWriter_LineSize = stream->PutIndent(ev, morkWriter_kRowDepth);
ioRow->SetRowClean();
mork_rid rid = roid->mOid_Id;
mork_rid rid;
rid = roid->mOid_Id;
*p++ = '[';
if ( roid->mOid_Scope == mWriter_TableRowScope )
ridSize = ev->TokenAsHex(p, roid->mOid_Id);

21
db/mork/src/orkinCell.cpp
View File

@ -429,7 +429,8 @@ orkinCell::SetColumn(nsIMdbEnv* mev, mdb_column inColumn)
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -478,7 +479,8 @@ orkinCell::GetCellInfo( // all cell metainfo except actual content
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -593,7 +595,8 @@ orkinCell::GetAnyChild( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -620,7 +623,8 @@ orkinCell::SetChildRow( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -640,7 +644,8 @@ orkinCell::GetChildRow( // access row of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -663,7 +668,8 @@ orkinCell::SetChildTable( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -683,7 +689,8 @@ orkinCell::GetChildTable( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}

2
db/mork/src/orkinFactory.cpp
View File

@ -330,7 +330,7 @@ orkinFactory::MakeHeap(nsIMdbEnv* mev, nsIMdbHeap** acqHeap)
/*inMutable*/ morkBool_kFalse, &outErr);
if ( ev )
{
nsIMdbHeap* outHeap = new orkinHeap();
outHeap = new orkinHeap();
if ( !outHeap )
ev->OutOfMemoryError();
}

11
db/mork/src/orkinRowCellCursor.cpp
View File

@ -361,7 +361,7 @@ orkinRowCellCursor::SetRow(nsIMdbEnv* mev, nsIMdbRow* ioRow)
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRow* row = 0;
row = 0;
orkinRow* orow = (orkinRow*) ioRow;
if ( orow->CanUseRow(mev, /*inMutable*/ morkBool_kFalse, &outErr, &row) )
{
@ -464,7 +464,8 @@ orkinRowCellCursor::SeekCell( // same as SetRow() followed by MakeCell()
this->CanUseRowCellCursor(mev, /*mut*/ morkBool_kFalse, &outErr, &row);
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRowCellCursor* cursor;
cursor = (morkRowCellCursor*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -493,7 +494,8 @@ orkinRowCellCursor::NextCell( // get next cell in the row
this->CanUseRowCellCursor(mev, /*mut*/ morkBool_kFalse, &outErr, &row);
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRowCellCursor* cursor;
cursor = (morkRowCellCursor*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -524,7 +526,8 @@ orkinRowCellCursor::PickNextCell( // get next cell in row within filter set
this->CanUseRowCellCursor(mev, /*mut*/ morkBool_kFalse, &outErr, &row);
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRowCellCursor* cursor;
cursor = (morkRowCellCursor*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}

6
db/mork/src/orkinTable.cpp
View File

@ -315,7 +315,8 @@ orkinTable::BecomeContent(nsIMdbEnv* mev,
morkEnv* ev = this->CanUseTable(mev, /*inMutable*/ morkBool_kFalse, &outErr);
if ( ev )
{
morkTable* table = (morkTable*) mHandle_Object;
morkTable* table;
table = (morkTable*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -332,7 +333,8 @@ orkinTable::DropActivity( // tell collection usage no longer expected
morkEnv* ev = this->CanUseTable(mev, /*inMutable*/ morkBool_kFalse, &outErr);
if ( ev )
{
morkTable* table = (morkTable*) mHandle_Object;
morkTable* table;
table = (morkTable*) mHandle_Object;
// ev->StubMethodOnlyError(); // okay to do nothing
outErr = ev->AsErr();
}

7
mailnews/db/mork/src/mork.h
View File

@ -28,9 +28,10 @@
// { %%%%% begin disable unused param warnings %%%%%
#define MORK_USED_1(x) (void)(&x)
#define MORK_USED_2(x,y) (void)(&x,&y)
#define MORK_USED_3(x,y,z) (void)(&x,&y,&z)
#define MORK_USED_4(w,x,y,z) (void)(&w,&x,&y,&z)
#define MORK_USED_2(x,y) (void)(&x);(void)(&y);
#define MORK_USED_3(x,y,z) (void)(&x);(void)(&y);(void)(&z);
#define MORK_USED_4(w,x,y,z) (void)(&w);(void)(&x);(void)(&y);(void)(&z);
// } %%%%% end disable unused param warnings %%%%%
// { %%%%% begin macro for finding class member offset %%%%%

8
mailnews/db/mork/src/morkBuilder.cpp
View File

@ -577,8 +577,8 @@ morkBuilder::AddBuilderCell(morkEnv* ev,
{
if ( mBuilder_CellsVecFill < morkBuilder_kCellsVecSize )
{
mork_fill index = mBuilder_CellsVecFill++;
outCell = mBuilder_CellsVec + index;
mork_fill indx = mBuilder_CellsVecFill++;
outCell = mBuilder_CellsVec + indx;
outCell->SetColumnAndChange(column, inChange);
outCell->mCell_Atom = 0;
}
@ -647,8 +647,8 @@ morkBuilder::OnNewCell(morkEnv* ev, const morkPlace& inPlace,
{
if ( mBuilder_CellsVecFill < morkBuilder_kCellsVecSize )
{
mork_fill index = mBuilder_CellsVecFill++;
morkCell* cell = mBuilder_CellsVec + index;
mork_fill indx = mBuilder_CellsVecFill++;
morkCell* cell = mBuilder_CellsVec + indx;
cell->SetColumnAndChange(column, inChange);
cell->mCell_Atom = 0;
mBuilder_Cell = cell;

2
mailnews/db/mork/src/morkCell.h
View File

@ -42,7 +42,7 @@ public:
morkCell() : mCell_Delta( 0 ), mCell_Atom( 0 ) { }
morkCell(const morkCell& c)
: mCell_Atom( c.mCell_Atom ), mCell_Delta( c.mCell_Delta ) { }
: mCell_Delta( c.mCell_Delta ), mCell_Atom( c.mCell_Atom ) { }
// note if ioAtom is non-nil, caller needs to call ioAtom->AddCellUse():
morkCell(mork_column inCol, mork_change inChange, morkAtom* ioAtom)

9
mailnews/db/mork/src/morkWriter.cpp
View File

@ -783,11 +783,11 @@ morkWriter::WriteAllStoreTables(morkEnv* ev)
morkTableMapIter* ti = &mWriter_RowSpaceTablesIter;
ti->InitTableMapIter(ev, &space->mRowSpace_Tables);
mork_tid* key = 0; // ignore keys in table map
mork_tid* key2 = 0; // ignore keys in table map
morkTable* table = 0; // old key row in the map
for ( c = ti->FirstTable(ev, key, &table); c && ev->Good();
c = ti->NextTable(ev, key, &table) )
for ( c = ti->FirstTable(ev, key2, &table); c && ev->Good();
c = ti->NextTable(ev, key2, &table) )
{
if ( table && table->IsTable() )
{
@ -1494,7 +1494,8 @@ morkWriter::PutRow(morkEnv* ev, morkRow* ioRow)
mWriter_LineSize = stream->PutIndent(ev, morkWriter_kRowDepth);
ioRow->SetRowClean();
mork_rid rid = roid->mOid_Id;
mork_rid rid;
rid = roid->mOid_Id;
*p++ = '[';
if ( roid->mOid_Scope == mWriter_TableRowScope )
ridSize = ev->TokenAsHex(p, roid->mOid_Id);

21
mailnews/db/mork/src/orkinCell.cpp
View File

@ -429,7 +429,8 @@ orkinCell::SetColumn(nsIMdbEnv* mev, mdb_column inColumn)
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -478,7 +479,8 @@ orkinCell::GetCellInfo( // all cell metainfo except actual content
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -593,7 +595,8 @@ orkinCell::GetAnyChild( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -620,7 +623,8 @@ orkinCell::SetChildRow( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -640,7 +644,8 @@ orkinCell::GetChildRow( // access row of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -663,7 +668,8 @@ orkinCell::SetChildTable( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -683,7 +689,8 @@ orkinCell::GetChildTable( // access table of specific attribute
&outErr, &cell);
if ( ev )
{
morkCellObject* cellObj = (morkCellObject*) mHandle_Object;
morkCellObject* cellObj;
cellObj = (morkCellObject*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}

2
mailnews/db/mork/src/orkinFactory.cpp
View File

@ -330,7 +330,7 @@ orkinFactory::MakeHeap(nsIMdbEnv* mev, nsIMdbHeap** acqHeap)
/*inMutable*/ morkBool_kFalse, &outErr);
if ( ev )
{
nsIMdbHeap* outHeap = new orkinHeap();
outHeap = new orkinHeap();
if ( !outHeap )
ev->OutOfMemoryError();
}

11
mailnews/db/mork/src/orkinRowCellCursor.cpp
View File

@ -361,7 +361,7 @@ orkinRowCellCursor::SetRow(nsIMdbEnv* mev, nsIMdbRow* ioRow)
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRow* row = 0;
row = 0;
orkinRow* orow = (orkinRow*) ioRow;
if ( orow->CanUseRow(mev, /*inMutable*/ morkBool_kFalse, &outErr, &row) )
{
@ -464,7 +464,8 @@ orkinRowCellCursor::SeekCell( // same as SetRow() followed by MakeCell()
this->CanUseRowCellCursor(mev, /*mut*/ morkBool_kFalse, &outErr, &row);
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRowCellCursor* cursor;
cursor = (morkRowCellCursor*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -493,7 +494,8 @@ orkinRowCellCursor::NextCell( // get next cell in the row
this->CanUseRowCellCursor(mev, /*mut*/ morkBool_kFalse, &outErr, &row);
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRowCellCursor* cursor;
cursor = (morkRowCellCursor*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -524,7 +526,8 @@ orkinRowCellCursor::PickNextCell( // get next cell in row within filter set
this->CanUseRowCellCursor(mev, /*mut*/ morkBool_kFalse, &outErr, &row);
if ( ev )
{
morkRowCellCursor* cursor = (morkRowCellCursor*) mHandle_Object;
morkRowCellCursor* cursor;
cursor = (morkRowCellCursor*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}

6
mailnews/db/mork/src/orkinTable.cpp
View File

@ -315,7 +315,8 @@ orkinTable::BecomeContent(nsIMdbEnv* mev,
morkEnv* ev = this->CanUseTable(mev, /*inMutable*/ morkBool_kFalse, &outErr);
if ( ev )
{
morkTable* table = (morkTable*) mHandle_Object;
morkTable* table;
table = (morkTable*) mHandle_Object;
ev->StubMethodOnlyError();
outErr = ev->AsErr();
}
@ -332,7 +333,8 @@ orkinTable::DropActivity( // tell collection usage no longer expected
morkEnv* ev = this->CanUseTable(mev, /*inMutable*/ morkBool_kFalse, &outErr);
if ( ev )
{
morkTable* table = (morkTable*) mHandle_Object;
morkTable* table;
table = (morkTable*) mHandle_Object;
// ev->StubMethodOnlyError(); // okay to do nothing
outErr = ev->AsErr();
}

12
mailnews/db/msgdb/src/nsDBFolderInfo.cpp
View File

@ -71,12 +71,12 @@ nsDBFolderInfo::QueryInterface(REFNSIID iid, void** result)
nsDBFolderInfo::nsDBFolderInfo(nsMsgDatabase *mdb)
: m_expiredMark(0),
m_viewType(0),
m_flags(0),
m_lastMessageLoaded(0),
m_numVisibleMessagesColumnToken(0),
m_expiredMarkColumnToken(0)
: m_flags(0),
m_lastMessageLoaded(0),
m_expiredMark(0),
m_viewType(0),
m_numVisibleMessagesColumnToken(0),
m_expiredMarkColumnToken(0)
{
NS_INIT_REFCNT();
m_mdbTable = NULL;

6
mailnews/db/msgdb/src/nsMsgHdr.cpp
View File

@ -128,7 +128,8 @@ NS_IMETHODIMP nsMsgHdr::SetMessageKey(nsMsgKey value)
NS_IMETHODIMP nsMsgHdr::GetFlags(PRUint32 *result)
{
nsresult res = GetUInt32Column(m_mdb->m_flagsColumnToken, &m_flags);
nsresult res;
res = GetUInt32Column(m_mdb->m_flagsColumnToken, &m_flags);
*result = m_flags;
return NS_OK;
}
@ -440,7 +441,8 @@ NS_IMETHODIMP nsMsgHdr::SetPriority(const char *priority)
// NS_MsgGetPriorityFromString will return normal in case of error,
// so we can ignore return value.
nsresult res = NS_MsgGetPriorityFromString(priority, &priorityVal);
nsresult res;
res = NS_MsgGetPriorityFromString(priority, &priorityVal);
return SetPriority(priorityVal);
}

12
mailnews/db/msgdb/src/nsMsgThread.cpp
View File

@ -171,7 +171,7 @@ NS_IMETHODIMP nsMsgThread::AddChild(nsIMsgDBHdr *child, PRBool threadInThread)
}
NS_IMETHODIMP nsMsgThread::GetChildAt(PRInt32 index, nsIMsgDBHdr **result)
NS_IMETHODIMP nsMsgThread::GetChildAt(PRInt32 aIndex, nsIMsgDBHdr **result)
{
nsresult ret = NS_OK;
@ -206,11 +206,11 @@ NS_IMETHODIMP nsMsgThread::GetChild(nsMsgKey msgKey, nsIMsgDBHdr **result)
}
NS_IMETHODIMP nsMsgThread::GetChildHdrAt(PRInt32 index, nsIMsgDBHdr **result)
NS_IMETHODIMP nsMsgThread::GetChildHdrAt(PRInt32 aIndex, nsIMsgDBHdr **result)
{
nsresult ret = NS_OK;
nsIMdbRow* resultRow;
mdb_pos pos = index - 1;
mdb_pos pos = aIndex - 1;
if (!result)
return NS_ERROR_NULL_POINTER;
@ -218,7 +218,7 @@ NS_IMETHODIMP nsMsgThread::GetChildHdrAt(PRInt32 index, nsIMsgDBHdr **result)
*result = nsnull;
// mork doesn't seem to handle this correctly, so deal with going off
// the end here.
if (index > m_numChildren)
if (aIndex > m_numChildren)
return NS_OK;
nsIMdbTableRowCursor *rowCursor;
@ -242,7 +242,7 @@ NS_IMETHODIMP nsMsgThread::GetChildHdrAt(PRInt32 index, nsIMsgDBHdr **result)
}
NS_IMETHODIMP nsMsgThread::RemoveChildAt(PRInt32 index)
NS_IMETHODIMP nsMsgThread::RemoveChildAt(PRInt32 aIndex)
{
nsresult ret = NS_OK;
@ -336,7 +336,7 @@ NS_IMPL_ISUPPORTS(nsMsgThreadEnumerator, nsIEnumerator::GetIID())
NS_IMETHODIMP nsMsgThreadEnumerator::First(void)
{
nsresult rv = 0;
//nsresult rv = NS_OK;
if (!mThread)
return NS_ERROR_NULL_POINTER;