mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Bug 555218 - 8: Other Places warnings. r=dietrich
This commit is contained in:
parent
ceb51d35aa
commit
fd9f80195c
@ -68,8 +68,11 @@
|
|||||||
|
|
||||||
#include "nsCycleCollectionParticipant.h"
|
#include "nsCycleCollectionParticipant.h"
|
||||||
|
|
||||||
|
// Avoid warnings about macro empty parameters.
|
||||||
|
#define FAVICONSTEP_FAKE_EMPTYPARAM
|
||||||
|
|
||||||
#define FAVICONSTEP_FAIL_IF_FALSE(_cond) \
|
#define FAVICONSTEP_FAIL_IF_FALSE(_cond) \
|
||||||
FAVICONSTEP_FAIL_IF_FALSE_RV(_cond, )
|
FAVICONSTEP_FAIL_IF_FALSE_RV(_cond, FAVICONSTEP_FAKE_EMPTYPARAM)
|
||||||
|
|
||||||
#define FAVICONSTEP_FAIL_IF_FALSE_RV(_cond, _rv) \
|
#define FAVICONSTEP_FAIL_IF_FALSE_RV(_cond, _rv) \
|
||||||
PR_BEGIN_MACRO \
|
PR_BEGIN_MACRO \
|
||||||
@ -81,7 +84,7 @@
|
|||||||
PR_END_MACRO
|
PR_END_MACRO
|
||||||
|
|
||||||
#define FAVICONSTEP_CANCEL_IF_TRUE(_cond, _notify) \
|
#define FAVICONSTEP_CANCEL_IF_TRUE(_cond, _notify) \
|
||||||
FAVICONSTEP_CANCEL_IF_TRUE_RV(_cond, _notify, )
|
FAVICONSTEP_CANCEL_IF_TRUE_RV(_cond, _notify, FAVICONSTEP_FAKE_EMPTYPARAM)
|
||||||
|
|
||||||
#define FAVICONSTEP_CANCEL_IF_TRUE_RV(_cond, _notify, _rv) \
|
#define FAVICONSTEP_CANCEL_IF_TRUE_RV(_cond, _notify, _rv) \
|
||||||
PR_BEGIN_MACRO \
|
PR_BEGIN_MACRO \
|
||||||
|
@ -390,9 +390,9 @@ nsNavHistory::nsNavHistory()
|
|||||||
, mTagsFolder(-1)
|
, mTagsFolder(-1)
|
||||||
, mInPrivateBrowsing(PRIVATEBROWSING_NOTINITED)
|
, mInPrivateBrowsing(PRIVATEBROWSING_NOTINITED)
|
||||||
, mDatabaseStatus(DATABASE_STATUS_OK)
|
, mDatabaseStatus(DATABASE_STATUS_OK)
|
||||||
|
, mHasHistoryEntries(-1)
|
||||||
, mCanNotify(true)
|
, mCanNotify(true)
|
||||||
, mCacheObservers("history-observers")
|
, mCacheObservers("history-observers")
|
||||||
, mHasHistoryEntries(-1)
|
|
||||||
{
|
{
|
||||||
#ifdef LAZY_ADD
|
#ifdef LAZY_ADD
|
||||||
mLazyTimerSet = PR_TRUE;
|
mLazyTimerSet = PR_TRUE;
|
||||||
@ -3453,9 +3453,9 @@ PlacesSQLQueryBuilder::SelectAsDay()
|
|||||||
sortingMode = mSortingMode;
|
sortingMode = mSortingMode;
|
||||||
|
|
||||||
PRUint16 resultType =
|
PRUint16 resultType =
|
||||||
(mResultType == nsINavHistoryQueryOptions::RESULTS_AS_DATE_QUERY) ?
|
mResultType == nsINavHistoryQueryOptions::RESULTS_AS_DATE_QUERY ?
|
||||||
nsINavHistoryQueryOptions::RESULTS_AS_URI :
|
(PRUint16)nsINavHistoryQueryOptions::RESULTS_AS_URI :
|
||||||
nsINavHistoryQueryOptions::RESULTS_AS_SITE_QUERY;
|
(PRUint16)nsINavHistoryQueryOptions::RESULTS_AS_SITE_QUERY;
|
||||||
|
|
||||||
// beginTime will become the node's time property, we don't use endTime
|
// beginTime will become the node's time property, we don't use endTime
|
||||||
// because it could overlap, and we use time to sort containers and find
|
// because it could overlap, and we use time to sort containers and find
|
||||||
@ -5262,7 +5262,6 @@ nsNavHistory::AddURIInternal(nsIURI* aURI, PRTime aTime, PRBool aRedirect,
|
|||||||
{
|
{
|
||||||
mozStorageTransaction transaction(mDBConn, PR_FALSE);
|
mozStorageTransaction transaction(mDBConn, PR_FALSE);
|
||||||
|
|
||||||
PRInt64 redirectBookmark = 0;
|
|
||||||
PRInt64 visitID = 0;
|
PRInt64 visitID = 0;
|
||||||
PRInt64 sessionID = 0;
|
PRInt64 sessionID = 0;
|
||||||
nsresult rv = AddVisitChain(aURI, aTime, aToplevel, aRedirect, aReferrer,
|
nsresult rv = AddVisitChain(aURI, aTime, aToplevel, aRedirect, aReferrer,
|
||||||
|
@ -609,9 +609,9 @@ nsNavHistoryContainerResultNode::GetState(PRUint16* _state)
|
|||||||
{
|
{
|
||||||
NS_ENSURE_ARG_POINTER(_state);
|
NS_ENSURE_ARG_POINTER(_state);
|
||||||
|
|
||||||
*_state = mExpanded ? STATE_OPENED :
|
*_state = mExpanded ? (PRUint16)STATE_OPENED
|
||||||
mAsyncPendingStmt ? STATE_LOADING :
|
: mAsyncPendingStmt ? (PRUint16)STATE_LOADING
|
||||||
STATE_CLOSED;
|
: (PRUint16)STATE_CLOSED;
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user