strcpy -> strncpy

main was before uart init
This commit is contained in:
joran2738
2023-11-06 23:09:15 +01:00
parent 5df86b3b83
commit fb1cc1e4bc
2 changed files with 15 additions and 17 deletions

View File

@@ -42,7 +42,7 @@ uint8_t set_owner_details_name(owner_details_t *owner, char *name){
else{
owner->name = (char*)realloc(owner->name,strlen(name) + 1);
}
strcpy(owner->name,name);
strncpy(owner->name,name,strlen(owner->name));
return 1;
}
else{
@@ -67,7 +67,7 @@ uint8_t set_owner_details_surname(owner_details_t* owner, char* surname){
else{
owner->surname = (char*)realloc(owner->surname,strlen(surname) + 1);
}
strcpy(owner->surname,surname);
strncpy(owner->surname,surname,strlen(owner->surname));
return 1;
}
else{
@@ -92,7 +92,7 @@ static uint8_t set_owner_details_reply(owner_details_t *owner, char *reply){
else{
owner->reply = (char*)realloc(owner->reply,strlen(reply) + 1);
}
strcpy(owner->reply,reply);
strncpy(owner->reply,reply,strlen(owner->reply));
return 1;
}
else{
@@ -160,7 +160,7 @@ char* get_owner_details_name(owner_details_t owner){
char *err_reply = "no name yet";
if(owner.name == NULL){
owner.name = (char*)malloc(strlen(err_reply));
strcpy(owner.name,err_reply);
strncpy(owner.name,err_reply,strlen(owner.name));
}
return owner.name;
}
@@ -177,9 +177,9 @@ char* get_owner_details_surname(owner_details_t owner){
char *err_reply = "no surname yet";
if(owner.surname == NULL){
owner.surname = (char*)malloc(strlen(err_reply));
strcpy(owner.name,err_reply);
strncpy(owner.surname,err_reply,strlen(owner.surname));
}
return owner.name;
return owner.surname;
}
/**
@@ -194,9 +194,9 @@ char* get_owner_details_reply(owner_details_t owner){
char *err_reply = "no reply yet";
if(owner.reply == NULL){
owner.reply = (char*)malloc(strlen(err_reply));
strcpy(owner.name,err_reply);
strncpy(owner.reply,err_reply,strlen(owner.reply));
}
return owner.name;
return owner.reply;
}

View File

@@ -82,14 +82,6 @@ static void MX_QUADSPI_Init(void);
int main(void)
{
/* USER CODE BEGIN 1 */
owner_details_t owner;
printf("hello world");
LOG_DEBUG("main","helloworld");
LOG_DEBUG("main","%s",get_owner_details_reply(owner));
set_owner_details(&owner, "joran", "vn");
LOG_DEBUG("main","%s",get_owner_details_reply(owner));
set_owner_details(&owner, "joran", "Van Nieuwenhoven");
LOG_DEBUG("main","%s",get_owner_details_reply(owner));
/* USER CODE END 1 */
@@ -118,7 +110,13 @@ int main(void)
MX_LWIP_Init();
MX_QUADSPI_Init();
/* USER CODE BEGIN 2 */
owner_details_t owner;
LOG_DEBUG("main1","helloworld");
LOG_DEBUG("main2","%s",get_owner_details_reply(owner));
set_owner_details(&owner, "joran", "vn");
LOG_DEBUG("main3","%s",get_owner_details_reply(owner));
set_owner_details(&owner, "joran", "Van Nieuwenhoven");
LOG_DEBUG("main4","%s",get_owner_details_reply(owner));
/* USER CODE END 2 */
/* Infinite loop */