Skip to content

Commit 29cc62e

Browse files
committed
Use 'unsigned int' for Header column numbers
Change return type of HeaderLayout_getColumns() from 'size_t' to 'unsigned int', and use 'unsigned int' type for all Header column iterators. Using 'size_t' is unnecessary (you cannot have 2^32 columns anyway) and would cause "-Wshorten-64-to-32" warnings (enabled by default in Clang 19).
1 parent 161c4ac commit 29cc62e

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

CategoriesPanel.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ static void CategoriesPanel_delete(Object* object) {
4242
}
4343

4444
static void CategoriesPanel_makeMetersPage(CategoriesPanel* this) {
45-
size_t columns = HeaderLayout_getColumns(this->scr->header->headerLayout);
45+
unsigned int columns = HeaderLayout_getColumns(this->scr->header->headerLayout);
4646
MetersPanel** meterPanels = xMallocArray(columns, sizeof(MetersPanel*));
4747
Settings* settings = this->host->settings;
4848

49-
for (size_t i = 0; i < columns; i++) {
49+
for (unsigned int i = 0; i < columns; i++) {
5050
char titleBuffer[32];
51-
xSnprintf(titleBuffer, sizeof(titleBuffer), "Column %zu", i + 1);
51+
xSnprintf(titleBuffer, sizeof(titleBuffer), "Column %u", i + 1);
5252
meterPanels[i] = MetersPanel_new(settings, titleBuffer, this->header->columns[i], this->scr);
5353

5454
if (i != 0) {

Header.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ void Header_delete(Header* this) {
5151
}
5252

5353
void Header_setLayout(Header* this, HeaderLayout hLayout) {
54-
size_t oldColumns = HeaderLayout_getColumns(this->headerLayout);
55-
size_t newColumns = HeaderLayout_getColumns(hLayout);
54+
unsigned int oldColumns = HeaderLayout_getColumns(this->headerLayout);
55+
unsigned int newColumns = HeaderLayout_getColumns(hLayout);
5656

5757
this->headerLayout = hLayout;
5858

@@ -61,11 +61,11 @@ void Header_setLayout(Header* this, HeaderLayout hLayout) {
6161

6262
if (newColumns > oldColumns) {
6363
this->columns = xReallocArray(this->columns, newColumns, sizeof(Vector*));
64-
for (size_t i = oldColumns; i < newColumns; i++)
64+
for (unsigned int i = oldColumns; i < newColumns; i++)
6565
this->columns[i] = Vector_new(Class(Meter), true, DEFAULT_SIZE);
6666
} else {
6767
// move meters from to-be-deleted columns into last one
68-
for (size_t i = newColumns; i < oldColumns; i++) {
68+
for (unsigned int i = newColumns; i < oldColumns; i++) {
6969
for (int j = this->columns[i]->items - 1; j >= 0; j--) {
7070
Vector_add(this->columns[newColumns - 1], Vector_take(this->columns[i], j));
7171
}
@@ -198,7 +198,7 @@ void Header_draw(const Header* this) {
198198
for (int y = 0; y < height; y++) {
199199
mvhline(y, 0, ' ', COLS);
200200
}
201-
const int numCols = HeaderLayout_getColumns(this->headerLayout);
201+
const int numCols = (int)HeaderLayout_getColumns(this->headerLayout);
202202
const int width = COLS - 2 * pad - (numCols - 1);
203203
int x = pad;
204204
float roundingLoss = 0.0F;
@@ -254,7 +254,7 @@ void Header_updateData(Header* this) {
254254
* Returns the number of columns to span, i.e. if the direct neighbor is occupied 1.
255255
*/
256256
static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const unsigned int curColumn, const int curHeight) {
257-
for (size_t i = curColumn + 1; i < HeaderLayout_getColumns(this->headerLayout); i++) {
257+
for (unsigned int i = curColumn + 1; i < HeaderLayout_getColumns(this->headerLayout); i++) {
258258
const Vector* meters = this->columns[i];
259259

260260
int height = pad;

Header.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ typedef struct Header_ {
2323
int height;
2424
} Header;
2525

26-
#define Header_forEachColumn(this_, i_) for (size_t (i_)=0, H_fEC_numColumns_ = HeaderLayout_getColumns((this_)->headerLayout); (i_) < H_fEC_numColumns_; ++(i_))
26+
#define Header_forEachColumn(this_, i_) for (unsigned int (i_)=0, H_fEC_numColumns_ = HeaderLayout_getColumns((this_)->headerLayout); (i_) < H_fEC_numColumns_; ++(i_))
2727

2828
Header* Header_new(Machine* host, HeaderLayout hLayout);
2929

HeaderLayout.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static const struct {
5454
[HF_FOUR_25_25_25_25] = { 4, { 25, 25, 25, 25 }, "four_25_25_25_25", "4 columns - 25/25/25/25", },
5555
};
5656

57-
static inline size_t HeaderLayout_getColumns(HeaderLayout hLayout) {
57+
static inline unsigned int HeaderLayout_getColumns(HeaderLayout hLayout) {
5858
/* assert the layout is initialized */
5959
assert(0 <= hLayout);
6060
assert(hLayout < LAST_HEADER_LAYOUT);

Settings.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ static void Settings_readMeterModes(Settings* this, const char* line, unsigned i
117117
}
118118

119119
static bool Settings_validateMeters(Settings* this) {
120-
const size_t colCount = HeaderLayout_getColumns(this->hLayout);
120+
const unsigned int colCount = HeaderLayout_getColumns(this->hLayout);
121121

122122
bool anyMeter = false;
123123

124-
for (size_t column = 0; column < colCount; column++) {
124+
for (unsigned int column = 0; column < colCount; column++) {
125125
char** names = this->hColumns[column].names;
126126
const MeterModeId* modes = this->hColumns[column].modes;
127127
const size_t len = this->hColumns[column].len;
@@ -154,7 +154,7 @@ static void Settings_defaultMeters(Settings* this, unsigned int initialCpuCount)
154154
}
155155

156156
// Release any previously allocated memory
157-
for (size_t i = 0; i < HeaderLayout_getColumns(this->hLayout); i++) {
157+
for (unsigned int i = 0; i < HeaderLayout_getColumns(this->hLayout); i++) {
158158
String_freeArray(this->hColumns[i].names);
159159
free(this->hColumns[i].modes);
160160
}

0 commit comments

Comments
 (0)