refactored tlibc collections
This commit is contained in:
@@ -16,7 +16,7 @@ str validateUsername_cstr(char username[USERNAME_SIZE_MAX+1], str* out_username_
|
||||
}
|
||||
|
||||
str validateUsername_str(str username){
|
||||
if(username.size < USERNAME_SIZE_MIN || username.size > USERNAME_SIZE_MAX){
|
||||
if(username.len < USERNAME_SIZE_MIN || username.len > USERNAME_SIZE_MAX){
|
||||
return str_from_cstr(
|
||||
sprintf_malloc(
|
||||
"username length (in bytes) must be >= %i and <= %i\n",
|
||||
@@ -25,7 +25,7 @@ str validateUsername_str(str username){
|
||||
);
|
||||
}
|
||||
|
||||
for(u32 i = 0; i < username.size; i++){
|
||||
for(u32 i = 0; i < username.len; i++){
|
||||
char c = username.data[i];
|
||||
if (char_isLatinLower(c) ||
|
||||
char_isLatinUpper(c) ||
|
||||
@@ -56,8 +56,8 @@ Result(void) ClientHandshake_tryConstruct(ClientHandshake* ptr, PacketHeader* he
|
||||
_PacketHeader_construct(ClientHandshake);
|
||||
memset(ptr, 0, sizeof(*ptr));
|
||||
|
||||
try_assert(session_key.size == sizeof(ptr->session_key));
|
||||
memcpy(ptr->session_key, session_key.data, session_key.size);
|
||||
try_assert(session_key.len == sizeof(ptr->session_key));
|
||||
memcpy(ptr->session_key, session_key.data, session_key.len);
|
||||
|
||||
Return RESULT_VOID;
|
||||
}
|
||||
@@ -97,10 +97,10 @@ Result(void) LoginRequest_tryConstruct(LoginRequest *ptr, PacketHeader* header,
|
||||
if(name_error_str.data){
|
||||
Return RESULT_ERROR(name_error_str.data, true);
|
||||
}
|
||||
memcpy(ptr->username, username.data, username.size);
|
||||
memcpy(ptr->username, username.data, username.len);
|
||||
|
||||
try_assert(token.size == sizeof(ptr->token));
|
||||
memcpy(ptr->token, token.data, token.size);
|
||||
try_assert(token.len == sizeof(ptr->token));
|
||||
memcpy(ptr->token, token.data, token.len);
|
||||
|
||||
Return RESULT_VOID;
|
||||
}
|
||||
@@ -126,10 +126,10 @@ Result(void) RegisterRequest_tryConstruct(RegisterRequest *ptr, PacketHeader* he
|
||||
if(name_error_str.data){
|
||||
Return RESULT_ERROR(name_error_str.data, true);
|
||||
}
|
||||
memcpy(ptr->username, username.data, username.size);
|
||||
memcpy(ptr->username, username.data, username.len);
|
||||
|
||||
try_assert(token.size == sizeof(ptr->token));
|
||||
memcpy(ptr->token, token.data, token.size);
|
||||
try_assert(token.len == sizeof(ptr->token));
|
||||
memcpy(ptr->token, token.data, token.len);
|
||||
|
||||
Return RESULT_VOID;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user