Loading src/group.cpp +9 −23 Changes for src/group.cpp: 9 added lines, 23 removed lines. Original line number Diff line number Diff line Loading @@ -70,20 +70,16 @@ void authdb::GroupData::addMember(const uuid &uid){ std::vector<uuid> members; if(_Members->datasize!=0){ if(_Members && _Members->datasize!=0){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(_Members->data+i,_Members->data+(i+sizeof(uuid_t)),&tmp[0]); members.emplace_back(tmp); if(uid==tmp){ throw AuthBackendError("User is already member!"); } delete[] _Members->data; members.emplace_back(tmp); } for(const uuid &mem : members){ if(mem==uid) throw AuthBackendError("User is already member!"); } members.push_back(uid); Loading @@ -101,7 +97,7 @@ void authdb::GroupData::addMember(const uuid &uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); delete[] data; } Loading Loading @@ -136,7 +132,7 @@ void authdb::GroupData::remMember(const uuid& uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); delete[] data; } Loading @@ -160,23 +156,13 @@ bool authdb::GroupData::isMember(const uuid uid){ } void authdb::GroupData::getMembers(std::vector<uuid>& members){ size_t asize=0; if(!_Members) return; if(getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, if(!getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); if(asize==0) return; asize=sizeof(size_t); char *start=_Members->data+asize; char *start=_Members->data; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); members.emplace_back(tmp); Loading Loading
src/group.cpp +9 −23 Changes for src/group.cpp: 9 added lines, 23 removed lines. Original line number Diff line number Diff line Loading @@ -70,20 +70,16 @@ void authdb::GroupData::addMember(const uuid &uid){ std::vector<uuid> members; if(_Members->datasize!=0){ if(_Members && _Members->datasize!=0){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(_Members->data+i,_Members->data+(i+sizeof(uuid_t)),&tmp[0]); members.emplace_back(tmp); if(uid==tmp){ throw AuthBackendError("User is already member!"); } delete[] _Members->data; members.emplace_back(tmp); } for(const uuid &mem : members){ if(mem==uid) throw AuthBackendError("User is already member!"); } members.push_back(uid); Loading @@ -101,7 +97,7 @@ void authdb::GroupData::addMember(const uuid &uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); delete[] data; } Loading Loading @@ -136,7 +132,7 @@ void authdb::GroupData::remMember(const uuid& uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); delete[] data; } Loading @@ -160,23 +156,13 @@ bool authdb::GroupData::isMember(const uuid uid){ } void authdb::GroupData::getMembers(std::vector<uuid>& members){ size_t asize=0; if(!_Members) return; if(getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, if(!getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); if(asize==0) return; asize=sizeof(size_t); char *start=_Members->data+asize; char *start=_Members->data; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); members.emplace_back(tmp); Loading