Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 371557 Tidy some items in nsAbLDAPDirectory*. r/sr=bienvenu

Browse Source
This commit is contained in:
bugzilla%standard8.demon.co.uk 2007-02-25 16:47:48 +00:00
parent f0ecc7fb41
commit 9d4744b2e2
3 changed files with 28 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mailnews/addrbook/src/nsAbLDAPDirectory.h
View File

@ -90,22 +90,15 @@ public:
NS_DECL_NSIABLDAPDIRECTORY
protected:
// historically, these classes weren't always friends, but since they
// are now (and should be), code and interface contortions that are used
// can probably go away.
friend class nsAbLDAPDirectoryQuery;
friend class nsAbQueryLDAPMessageListener;
nsresult Initiate ();
nsresult InitiateConnection ();
nsresult Initiate();
nsresult InitiateConnection();
PRPackedBool mInitialized;
PRPackedBool mInitializedConnection;
PRPackedBool mPerformingQuery;
PRInt32 mContext;
PRInt32 mMaxHits;
nsCOMPtr<nsILDAPURL> mURL ;
nsCOMPtr<nsILDAPURL> mURL;
nsCOMPtr<nsILDAPConnection> mConnection;
nsCOMPtr<nsIAbBooleanExpression> mExpression;

65
mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
View File

@ -270,17 +270,21 @@ nsresult nsAbQueryLDAPMessageListener::DoTask()
// I don't _think_ it's ever actually possible to get here without having
// an nsAbLDAPDirectory object, but, just in case, I'll do a QI instead
// of just static casts...
nsCOMPtr<nsIAbLDAPDirectory> nsIAbDir =
nsCOMPtr<nsIAbLDAPDirectory> abLDAPDir =
do_QueryInterface(mDirectoryQuery, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsAbLDAPDirectory *dir =
NS_STATIC_CAST(nsAbLDAPDirectory *,
NS_STATIC_CAST(nsIAbLDAPDirectory *, nsIAbDir.get()));
rv = mSearchOperation->SetServerControls(dir->mSearchServerControls.get());
nsCOMPtr<nsIMutableArray> searchControls;
rv = abLDAPDir->GetSearchServerControls(getter_AddRefs(searchControls));
NS_ENSURE_SUCCESS(rv, rv);
rv = mSearchOperation->SetClientControls(dir->mSearchClientControls.get());
rv = mSearchOperation->SetServerControls(searchControls);
NS_ENSURE_SUCCESS(rv, rv);
rv = abLDAPDir->GetSearchClientControls(getter_AddRefs(searchControls));
NS_ENSURE_SUCCESS(rv, rv);
rv = mSearchOperation->SetClientControls(searchControls);
NS_ENSURE_SUCCESS(rv, rv);
return mSearchOperation->SearchExt(dn, scope, filter, attributes.GetSize(),
@ -411,8 +415,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbLDAPDirectoryQuery, nsIAbDirectoryQuery)
nsAbLDAPDirectoryQuery::nsAbLDAPDirectoryQuery() :
mProtocolVersion (nsILDAPConnection::VERSION3),
mInitialized(PR_FALSE),
mLock (nsnull)
mInitialized(PR_FALSE)
{
}
@ -426,23 +429,6 @@ nsAbLDAPDirectoryQuery::~nsAbLDAPDirectoryQuery()
msgListener->mDirectoryQuery = nsnull;
msgListener->mQueryListener = nsnull;
}
if(mLock)
PR_DestroyLock (mLock);
}
nsresult nsAbLDAPDirectoryQuery::Initiate ()
{
if (mInitialized)
return NS_OK;
mLock = PR_NewLock ();
if(!mLock)
{
return NS_ERROR_OUT_OF_MEMORY;
}
mInitialized = PR_TRUE;
return NS_OK;
}
NS_IMETHODIMP nsAbLDAPDirectoryQuery::DoQuery(nsIAbDirectoryQueryArguments* arguments,
@ -452,13 +438,12 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::DoQuery(nsIAbDirectoryQueryArguments* argu
PRInt32* _retval)
{
PRBool alreadyInitialized = mInitialized;
nsresult rv = Initiate ();
NS_ENSURE_SUCCESS(rv, rv);
mInitialized = PR_TRUE;
// Get the scope
nsCAutoString scope;
PRBool doSubDirectories;
rv = arguments->GetQuerySubDirectories (&doSubDirectories);
nsresult rv = arguments->GetQuerySubDirectories (&doSubDirectories);
NS_ENSURE_SUCCESS(rv, rv);
scope = (doSubDirectories) ? "sub" : "one";
@ -507,7 +492,7 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::DoQuery(nsIAbDirectoryQueryArguments* argu
}
// Set up the search ldap url
rv = GetLDAPURL (getter_AddRefs (mDirectoryUrl));
rv = GetLDAPURL(getter_AddRefs(mDirectoryUrl));
NS_ENSURE_SUCCESS(rv, rv);
nsCAutoString host;
@ -524,7 +509,7 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::DoQuery(nsIAbDirectoryQueryArguments* argu
PRUint32 options;
rv = mDirectoryUrl->GetOptions(&options);
NS_ENSURE_SUCCESS(rv,rv);
NS_ENSURE_SUCCESS(rv, rv);
// get the directoryFilter from the directory url and merge it with the user's
// search filter
@ -622,18 +607,18 @@ NS_IMETHODIMP nsAbLDAPDirectoryQuery::DoQuery(nsIAbDirectoryQueryArguments* argu
/* void stopQuery (in long contextID); */
NS_IMETHODIMP nsAbLDAPDirectoryQuery::StopQuery(PRInt32 contextID)
{
nsresult rv = Initiate ();
NS_ENSURE_SUCCESS(rv, rv);
mInitialized = PR_TRUE;
if (!mListener)
return NS_OK;
if (!mListener)
return NS_OK;
nsAbQueryLDAPMessageListener *listener =
NS_STATIC_CAST(nsAbQueryLDAPMessageListener *,
NS_STATIC_CAST(nsILDAPMessageListener *, mListener.get()));
if (listener)
rv = listener->Cancel ();
return rv;
nsAbQueryLDAPMessageListener *listener =
NS_STATIC_CAST(nsAbQueryLDAPMessageListener *,
NS_STATIC_CAST(nsILDAPMessageListener *, mListener.get()));
if (listener)
return listener->Cancel();
return NS_OK;
}

5
mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
View File

@ -68,9 +68,6 @@ protected:
nsIAbDirectoryQueryArguments* arguments,
nsCString& returnAttributes);
protected:
friend class nsAbQueryLDAPMessageListener;
nsresult Initiate ();
nsXPIDLCString mLogin; // authenticate to the LDAP server as...
nsCOMPtr<nsILDAPURL> mDirectoryUrl; // the URL for the server
PRUint32 mProtocolVersion; // version of LDAP (see nsILDAPConnection.idl)
@ -78,8 +75,6 @@ protected:
private:
PRBool mInitialized;
PRLock* mLock;
};
#endif // nsAbLDAPDirectoryQuery_h__