Skip to content

Commit

Permalink
Prefer size_t when array indices involved
Browse files Browse the repository at this point in the history
  • Loading branch information
BenBE authored and natoscott committed Sep 4, 2024
1 parent fbd1425 commit 9d9f4bf
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions Settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,23 @@ static char** Settings_splitLineToIDs(const char* line) {
return ids;
}

static void Settings_readMeters(Settings* this, const char* line, unsigned int column) {
static void Settings_readMeters(Settings* this, const char* line, size_t column) {
column = MINIMUM(column, HeaderLayout_getColumns(this->hLayout) - 1);
this->hColumns[column].names = Settings_splitLineToIDs(line);
}

static void Settings_readMeterModes(Settings* this, const char* line, unsigned int column) {
static void Settings_readMeterModes(Settings* this, const char* line, size_t column) {
char** ids = Settings_splitLineToIDs(line);

int len = 0;
for (int i = 0; ids[i]; i++) {
size_t len = 0;
for (size_t i = 0; ids[i]; i++) {
len++;
}

column = MINIMUM(column, HeaderLayout_getColumns(this->hLayout) - 1);
this->hColumns[column].len = len;
MeterModeId* modes = len ? xCalloc(len, sizeof(MeterModeId)) : NULL;
for (int i = 0; i < len; i++) {
for (size_t i = 0; i < len; i++) {
modes[i] = (MeterModeId) atoi(ids[i]);
}
this->hColumns[column].modes = modes;
Expand Down Expand Up @@ -117,7 +118,7 @@ static bool Settings_validateMeters(Settings* this) {

static void Settings_defaultMeters(Settings* this, const Machine* host) {
unsigned int initialCpuCount = host->activeCPUs;
int sizes[] = { 3, 3 };
size_t sizes[] = { 3, 3 };

if (initialCpuCount > 4 && initialCpuCount <= 128) {
sizes[1]++;
Expand Down

0 comments on commit 9d9f4bf

Please sign in to comment.