mirror of
https://github.com/Dr-Noob/cpufetch.git
synced 2026-03-25 16:00:39 +01:00
[v1.06] Replace emalloc+memset with ecalloc when possible. Refactor some memory allocation code
This commit is contained in:
@@ -100,9 +100,8 @@ struct extensions* get_extensions_from_str(char* str) {
|
||||
return ext;
|
||||
}
|
||||
|
||||
int len = sizeof(char) * (strlen(str)+1);
|
||||
ext->str = emalloc(sizeof(char) * len);
|
||||
memset(ext->str, 0, len);
|
||||
int len = strlen(str);
|
||||
ext->str = ecalloc(len+1, sizeof(char));
|
||||
strncpy(ext->str, str, sizeof(char) * len);
|
||||
|
||||
// Code inspired in Linux kernel (riscv_fill_hwcap):
|
||||
|
||||
@@ -40,8 +40,7 @@ char* get_field_from_devtree(int DEVTREE_FIELD) {
|
||||
|
||||
tmp1++;
|
||||
int strlen = filelen-(tmp1-buf);
|
||||
char* hardware = emalloc(sizeof(char) * strlen);
|
||||
memset(hardware, 0, sizeof(char) * strlen);
|
||||
char* hardware = ecalloc(strlen, sizeof(char));
|
||||
strncpy(hardware, tmp1, strlen-1);
|
||||
|
||||
return hardware;
|
||||
@@ -70,9 +69,8 @@ char* parse_cpuinfo_field(char* field_str) {
|
||||
}
|
||||
|
||||
int ret_strlen = (end-tmp);
|
||||
char* ret = emalloc(sizeof(char) * (ret_strlen+1));
|
||||
memset(ret, 0, sizeof(char) * (ret_strlen+1));
|
||||
strncpy(ret, tmp, ret_strlen);
|
||||
char* ret = ecalloc(ret_strlen+1, sizeof(char));
|
||||
strncpy(ret, tmp, sizeof(char) * ret_strlen);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user