Changeset 6370

Timestamp:

07/01/08 05:55:33 (3 months ago)

Author:

flynd

Message:

Added function to get user id of an owner. Added a DropOwner?() that takes the locked object as parameter like the other drop functions.

Location:

trunk/licq

Files:

• include/licq_user.h (modified) (1 diff)
• src/user.cpp (modified) (2 diffs)

trunk/licq/include/licq_user.h

@@ -1265 +1265 @@
   ICQOwner *FetchOwner(unsigned long, unsigned short);
   void DropOwner(unsigned long);
+
+  /**
+   * Release owner lock
+   */
+  void DropOwner(ICQOwner* owner);
+
   bool IsOnList(const char *, unsigned long);
   ICQOwner *FindOwner(const char *, unsigned long);
+
+  /**
+   * Get user id for an owner
+   *
+   * @param ppid Protocol id
+   * @return User id of owner or empty string if no such owner exists
+   */
+  std::string OwnerId(unsigned long ppid);
 
   // ICQ Protocol only (from original Licq)

trunk/licq/src/user.cpp

@@ -835 +835 @@
 }
 
+string CUserManager::OwnerId(unsigned long ppid)
+{
+  ICQOwner* owner = FetchOwner(ppid, LOCK_R);
+  if (owner == NULL)
+    return "";
+
+  string ret = owner->IdString();
+  DropOwner(ppid);
+  return ret;
+}
+
 /*---------------------------------------------------------------------------
  * CUserManager::AddUser
@@ -1368 +1379 @@
   }
   UnlockOwnerList();
+}
+
+void CUserManager::DropOwner(ICQOwner* owner)
+{
+  if (owner == NULL)
+    return;
+  owner->Unlock();
 }