Changeset 6338

Timestamp:

06/18/08 23:55:04 (6 months ago)

Author:

flynd

Message:

Added function so we can check if a group exists without locking it.

Location:

trunk/licq

Files:

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

trunk/licq/include/licq_user.h

@@ -1360 +1360 @@
 
   /**
+   * Check if a group id is valid
+   *
+   * @param gtype Group type
+   * @param groupId Id of group to check for
+   * @return True if the group exists
+   */
+  bool groupExists(GroupType gtype, unsigned short groupId);
+
+  /**
    * Add a user group
    *

trunk/licq/src/user.cpp

@@ -872 +872 @@
   if (group != NULL)
     group->Unlock();
+}
+
+bool CUserManager::groupExists(GroupType gtype, unsigned short groupId)
+{
+  // Is it a valid system group?
+  if (gtype == GROUPS_SYSTEM)
+    return (groupId <= NUM_GROUPS_SYSTEM_ALL);
+
+  // Is it an invalid group type?
+  if (gtype != GROUPS_USER)
+    return false;
+
+  // Does the user group exist in the list?
+  GroupMap* groups = LockGroupList(LOCK_R);
+  GroupMap::const_iterator iter = groups->find(groupId);
+  bool found = (iter != groups->end());
+  UnlockGroupList();
+  return found;
 }