Merge branch 'natoscott-darwin-ci-fixes'

natoscott · natoscott · commit 0e2eed056251 · 2025-10-09T18:27:10.000+11:00
diff --git a/CommandLine.c b/CommandLine.c
@@ -209,7 +209,7 @@ static CommandLineStatus parseArguments(int argc, char** argv, CommandLineSettin
                      fprintf(stderr, "Error: invalid user \"%s\".\n", username);
                      return STATUS_ERROR_EXIT;
                   }
-               flags->userId = atol(username);
+               flags->userId = (uid_t)atol(username);
             }
             break;
          }
diff --git a/Header.c b/Header.c
@@ -77,7 +77,7 @@ void Header_setLayout(Header* this, HeaderLayout hLayout) {
    Header_calculateHeight(this);
 }
 
-static void Header_addMeterByName(Header* this, const char* name, MeterModeId mode, unsigned int column) {
+static void Header_addMeterByName(Header* this, const char* name, MeterModeId mode, size_t column) {
    assert(column < HeaderLayout_getColumns(this->headerLayout));
 
    Vector* meters = this->columns[column];
@@ -170,7 +170,7 @@ void Header_writeBackToSettings(const Header* this) {
    }
 }
 
-Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column) {
+Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, size_t column) {
    assert(column < HeaderLayout_getColumns(this->headerLayout));
 
    Vector* meters = this->columns[column];
@@ -198,8 +198,8 @@ void Header_draw(const Header* this) {
    for (int y = 0; y < height; y++) {
       mvhline(y, 0, ' ', COLS);
    }
-   const int numCols = HeaderLayout_getColumns(this->headerLayout);
-   const int width = COLS - 2 * pad - (numCols - 1);
+   const size_t numCols = HeaderLayout_getColumns(this->headerLayout);
+   const int width = COLS - 2 * pad - ((int)numCols - 1);
    int x = pad;
    float roundingLoss = 0.0F;
 
@@ -253,7 +253,7 @@ void Header_updateData(Header* this) {
  * by counting how many columns to the right are empty or contain a BlankMeter.
  * Returns the number of columns to span, i.e. if the direct neighbor is occupied 1.
  */
-static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const unsigned int curColumn, const int curHeight) {
+static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const size_t curColumn, const int curHeight) {
    for (size_t i = curColumn + 1; i < HeaderLayout_getColumns(this->headerLayout); i++) {
       const Vector* meters = this->columns[i];
 
@@ -269,11 +269,11 @@ static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const
             continue;
 
          if (!Object_isA((const Object*) meter, (const ObjectClass*) &BlankMeter_class))
-            return i - curColumn;
+            return (int)(i - curColumn);
       }
    }
 
-   return HeaderLayout_getColumns(this->headerLayout) - curColumn;
+   return (int)(HeaderLayout_getColumns(this->headerLayout) - curColumn);
 }
 
 int Header_calculateHeight(Header* this) {
diff --git a/Header.h b/Header.h
@@ -35,7 +35,7 @@ void Header_populateFromSettings(Header* this);
 
 void Header_writeBackToSettings(const Header* this);
 
-Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column);
+Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, size_t column);
 
 void Header_reinit(Header* this);
 
diff --git a/IncSet.h b/IncSet.h
@@ -25,7 +25,7 @@ typedef enum {
 typedef struct IncMode_ {
    char buffer[INCMODE_MAX + 1];
    FunctionBar* bar;
-   uint32_t index;
+   size_t index;
    bool isFilter;
 } IncMode;
 
diff --git a/Panel.c b/Panel.c
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -79,7 +80,7 @@ void Panel_done(Panel* this) {
 
 void Panel_setCursorToSelection(Panel* this) {
    this->cursorY = this->y + this->selected - this->scrollV + 1;
-   this->cursorX = this->x + this->selectedLen - this->scrollH;
+   this->cursorX = this->x + (int)this->selectedLen - this->scrollH;
 }
 
 void Panel_setSelectionColor(Panel* this, ColorElements colorId) {
@@ -421,7 +422,7 @@ bool Panel_onKey(Panel* this, int key) {
 
       case KEY_CTRL('E'):
       case '$':
-         this->scrollH = MAXIMUM(this->selectedLen - this->w, 0);
+         this->scrollH = CLAMP((int)this->selectedLen - this->w, 0, INT_MAX);
          this->needsRedraw = true;
          break;
 
diff --git a/Panel.h b/Panel.h
@@ -67,7 +67,7 @@ struct Panel_ {
    Vector* items;
    int selected;
    int oldSelected;
-   int selectedLen;
+   size_t selectedLen;
    void* eventHandlerState;
    int scrollV;
    int scrollH;
diff --git a/Process.c b/Process.c
@@ -892,7 +892,7 @@ static bool Process_setPriority(Process* this, int priority) {
 bool Process_rowChangePriorityBy(Row* super, Arg delta) {
    Process* this = (Process*) super;
    assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
-   return Process_setPriority(this, this->nice + delta.i);
+   return Process_setPriority(this, (int)this->nice + delta.i);
 }
 
 static bool Process_sendSignal(Process* this, Arg sgn) {
diff --git a/RichString.c b/RichString.c
@@ -21,7 +21,7 @@ in the source distribution for its full text.
 
 #define charBytes(n) (sizeof(CharType) * (n))
 
-static void RichString_extendLen(RichString* this, int len) {
+static void RichString_extendLen(RichString* this, size_t len) {
    if (this->chptr == this->chstr) {
       // String is in internal buffer
       if (len > RICHSTRING_MAXLEN) {
@@ -46,13 +46,13 @@ static void RichString_extendLen(RichString* this, int len) {
    }
 
    RichString_setChar(this, len, 0);
-   this->chlen = len;
+   this->chlen = (int)len;
 }
 
-static void RichString_setLen(RichString* this, int len) {
+static void RichString_setLen(RichString* this, size_t len) {
    if (len < RICHSTRING_MAXLEN && this->chlen < RICHSTRING_MAXLEN) {
       RichString_setChar(this, len, 0);
-      this->chlen = len;
+      this->chlen = (int)len;
    } else {
       RichString_extendLen(this, len);
    }
@@ -97,33 +97,33 @@ static size_t mbstowcs_nonfatal(wchar_t* restrict dest, const char* restrict src
    return written;
 }
 
-static inline int RichString_writeFromWide(RichString* this, int attrs, const char* data_c, int from, int len) {
+static inline int RichString_writeFromWide(RichString* this, int attrs, const char* data_c, int from, size_t len) {
    wchar_t data[len];
    len = mbstowcs_nonfatal(data, data_c, len);
    if (len <= 0)
       return 0;
 
-   int newLen = from + len;
+   size_t newLen = from + len;
    RichString_setLen(this, newLen);
-   for (int i = from, j = 0; i < newLen; i++, j++) {
+   for (size_t i = from, j = 0; i < newLen; i++, j++) {
       this->chptr[i] = (CharType) { .attr = attrs & 0xffffff, .chars = { (iswprint(data[j]) ? data[j] : L'\xFFFD') } };
    }
 
-   return len;
+   return (int)len;
 }
 
-int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, int len, int* columns) {
+int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, size_t len, int* columns) {
    wchar_t data[len];
    len = mbstowcs_nonfatal(data, data_c, len);
    if (len <= 0)
       return 0;
 
    int from = this->chlen;
-   int newLen = from + len;
+   size_t newLen = from + len;
    RichString_setLen(this, newLen);
    int columnsWritten = 0;
    int pos = from;
-   for (int j = 0; j < len; j++) {
+   for (size_t j = 0; j < len; j++) {
       wchar_t c = iswprint(data[j]) ? data[j] : L'\xFFFD';
       int cwidth = wcwidth(c);
       if (cwidth > *columns)
@@ -142,20 +142,20 @@ int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_
    return pos - from;
 }
 
-static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data, int from, int len) {
-   int newLen = from + len;
+static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data, int from, size_t len) {
+   size_t newLen = from + len;
    RichString_setLen(this, newLen);
-   for (int i = from, j = 0; i < newLen; i++, j++) {
+   for (size_t i = from, j = 0; i < newLen; i++, j++) {
       assert((unsigned char)data[j] <= SCHAR_MAX);
       this->chptr[i] = (CharType) { .attr = attrs & 0xffffff, .chars = { (isprint((unsigned char)data[j]) ? data[j] : L'\xFFFD') } };
    }
 
-   return len;
+   return (int)len;
 }
 
-inline void RichString_setAttrn(RichString* this, int attrs, int start, int charcount) {
-   int end = CLAMP(start + charcount, 0, this->chlen);
-   for (int i = start; i < end; i++) {
+inline void RichString_setAttrn(RichString* this, int attrs, size_t start, size_t charcount) {
+   size_t end = CLAMP(start + charcount, 0, (size_t)this->chlen);
+   for (size_t i = start; i < end; i++) {
       this->chptr[i].attr = attrs;
    }
 }
@@ -182,30 +182,31 @@ int RichString_findChar(const RichString* this, char c, int start) {
 
 #else /* HAVE_LIBNCURSESW */
 
-static inline int RichString_writeFromWide(RichString* this, int attrs, const char* data_c, int from, int len) {
-   int newLen = from + len;
+static inline int RichString_writeFromWide(RichString* this, int attrs, const char* data_c, int from, size_t len) {
+   size_t newLen = from + len;
    RichString_setLen(this, newLen);
-   for (int i = from, j = 0; i < newLen; i++, j++) {
+   for (size_t i = from, j = 0; i < newLen; i++, j++) {
       this->chptr[i] = (((unsigned char)data_c[j]) >= 32 ? ((unsigned char)data_c[j]) : '?') | attrs;
    }
    this->chptr[newLen] = 0;
 
    return len;
 }
 
-int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, int len, int* columns) {
-   int written = RichString_writeFromWide(this, attrs, data_c, this->chlen, MINIMUM(len, *columns));
+int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, size_t len, int* columns) {
+   size_t minlen = MINIMUM(len, (size_t) *columns);
+   int written = RichString_writeFromWide(this, attrs, data_c, this->chlen, minlen);
    *columns = written;
    return written;
 }
 
-static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data_c, int from, int len) {
+static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data_c, int from, size_t len) {
    return RichString_writeFromWide(this, attrs, data_c, from, len);
 }
 
-void RichString_setAttrn(RichString* this, int attrs, int start, int charcount) {
-   int end = CLAMP(start + charcount, 0, this->chlen);
-   for (int i = start; i < end; i++) {
+void RichString_setAttrn(RichString* this, int attrs, size_t start, size_t charcount) {
+   size_t end = CLAMP(start + charcount, 0, (size_t)this->chlen);
+   for (size_t i = start; i < end; i++) {
       this->chptr[i] = (this->chptr[i] & 0xff) | attrs;
    }
 }
@@ -246,7 +247,7 @@ int RichString_appendWide(RichString* this, int attrs, const char* data) {
    return RichString_writeFromWide(this, attrs, data, this->chlen, strlen(data));
 }
 
-int RichString_appendnWide(RichString* this, int attrs, const char* data, int len) {
+int RichString_appendnWide(RichString* this, int attrs, const char* data, size_t len) {
    return RichString_writeFromWide(this, attrs, data, this->chlen, len);
 }
 
@@ -258,7 +259,7 @@ int RichString_appendAscii(RichString* this, int attrs, const char* data) {
    return RichString_writeFromAscii(this, attrs, data, this->chlen, strlen(data));
 }
 
-int RichString_appendnAscii(RichString* this, int attrs, const char* data, int len) {
+int RichString_appendnAscii(RichString* this, int attrs, const char* data, size_t len) {
    return RichString_writeFromAscii(this, attrs, data, this->chlen, len);
 }
 
diff --git a/RichString.h b/RichString.h
@@ -50,7 +50,7 @@ void RichString_delete(RichString* this);
 
 void RichString_rewind(RichString* this, int count);
 
-void RichString_setAttrn(RichString* this, int attrs, int start, int charcount);
+void RichString_setAttrn(RichString* this, int attrs, size_t start, size_t charcount);
 
 int RichString_findChar(const RichString* this, char c, int start);
 
@@ -63,17 +63,17 @@ void RichString_appendChr(RichString* this, int attrs, char c, int count);
 int RichString_appendWide(RichString* this, int attrs, const char* data);
 
 ATTR_ACCESS3_R(3, 4)
-int RichString_appendnWide(RichString* this, int attrs, const char* data, int len);
+int RichString_appendnWide(RichString* this, int attrs, const char* data, size_t len);
 
 /* columns takes the maximum number of columns to write and contains on return the number of columns written. */
-int RichString_appendnWideColumns(RichString* this, int attrs, const char* data, int len, int* columns);
+int RichString_appendnWideColumns(RichString* this, int attrs, const char* data, size_t len, int* columns);
 
 int RichString_writeWide(RichString* this, int attrs, const char* data);
 
 int RichString_appendAscii(RichString* this, int attrs, const char* data);
 
 ATTR_ACCESS3_R(3, 4)
-int RichString_appendnAscii(RichString* this, int attrs, const char* data, int len);
+int RichString_appendnAscii(RichString* this, int attrs, const char* data, size_t len);
 
 int RichString_writeAscii(RichString* this, int attrs, const char* data);
 
diff --git a/ScreenManager.c b/ScreenManager.c
@@ -219,13 +219,13 @@ static void ScreenManager_drawScreenTabs(ScreenManager* this) {
    attrset(CRT_colors[RESET_COLOR]);
 }
 
-static void ScreenManager_drawPanels(ScreenManager* this, int focus, bool force_redraw) {
+static void ScreenManager_drawPanels(ScreenManager* this, size_t focus, bool force_redraw) {
    Settings* settings = this->host->settings;
    if (settings->screenTabs) {
       ScreenManager_drawScreenTabs(this);
    }
-   const int nPanels = this->panelCount;
-   for (int i = 0; i < nPanels; i++) {
+   const size_t nPanels = this->panelCount;
+   for (size_t i = 0; i < nPanels; i++) {
       Panel* panel = (Panel*) Vector_get(this->panels, i);
       Panel_draw(panel,
                  force_redraw,
@@ -238,7 +238,7 @@ static void ScreenManager_drawPanels(ScreenManager* this, int focus, bool force_
 
 void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, const char* name) {
    bool quit = false;
-   int focus = 0;
+   size_t focus = 0;
 
    Panel* panelFocus = (Panel*) Vector_get(this->panels, focus);
    Settings* settings = this->host->settings;
diff --git a/ScreenTabsPanel.h b/ScreenTabsPanel.h
@@ -24,7 +24,7 @@ typedef struct ScreenNamesPanel_ {
    char buffer[SCREEN_NAME_LEN + 1];
    DynamicScreen* ds;
    char* saved;
-   int cursor;
+   size_t cursor;
    ListItem* renamingItem;
 } ScreenNamesPanel;
 
diff --git a/ScreensPanel.h b/ScreensPanel.h
@@ -31,9 +31,9 @@ typedef struct ScreensPanel_ {
    ColumnsPanel* columns;
    AvailableColumnsPanel* availableColumns;
    char buffer[SCREEN_NAME_LEN + 1];
-   char* saved;
-   int cursor;
    bool moving;
+   char* saved;
+   size_t cursor;
    ListItem* renamingItem;
 } ScreensPanel;
 
diff --git a/Settings.c b/Settings.c
@@ -927,14 +927,14 @@ bool Settings_isReadonly(void) {
 }
 
 void Settings_setHeaderLayout(Settings* this, HeaderLayout hLayout) {
-   unsigned int oldColumns = HeaderLayout_getColumns(this->hLayout);
-   unsigned int newColumns = HeaderLayout_getColumns(hLayout);
+   size_t oldColumns = HeaderLayout_getColumns(this->hLayout);
+   size_t newColumns = HeaderLayout_getColumns(hLayout);
 
    if (newColumns > oldColumns) {
       this->hColumns = xReallocArray(this->hColumns, newColumns, sizeof(MeterColumnSetting));
       memset(this->hColumns + oldColumns, 0, (newColumns - oldColumns) * sizeof(MeterColumnSetting));
    } else if (newColumns < oldColumns) {
-      for (unsigned int i = newColumns; i < oldColumns; i++) {
+      for (size_t i = newColumns; i < oldColumns; i++) {
          if (this->hColumns[i].names) {
             for (size_t j = 0; j < this->hColumns[i].len; j++)
                free(this->hColumns[i].names[j]);
diff --git a/Vector.c b/Vector.c
@@ -79,10 +79,9 @@ bool Vector_countEquals(const Vector* this, unsigned int expectedCount) {
    return n == expectedCount;
 }
 
-Object* Vector_get(const Vector* this, int idx) {
-   assert(idx >= 0);
-   assert(idx < this->arraySize);
-   assert(idx < this->items);
+Object* Vector_get(const Vector* this, size_t idx) {
+   assert(idx < (size_t)this->arraySize);
+   assert(idx < (size_t)this->items);
    assert(this->array[idx]);
    assert(Object_isA(this->array[idx], this->type));
    return this->array[idx];
diff --git a/Vector.h b/Vector.h
diff --git a/darwin/DarwinMachine.c b/darwin/DarwinMachine.c
diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c
diff --git a/darwin/Platform.c b/darwin/Platform.c

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ static CommandLineStatus parseArguments(int argc, char** argv, CommandLineSettin`
`209`	`209`	`fprintf(stderr, "Error: invalid user \"%s\".\n", username);`
`210`	`210`	`return STATUS_ERROR_EXIT;`
`211`	`211`	`}`
`212`		`- flags->userId = atol(username);`
	`212`	`+ flags->userId = (uid_t)atol(username);`
`213`	`213`	`}`
`214`	`214`	`break;`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ void Header_setLayout(Header* this, HeaderLayout hLayout) {`
`77`	`77`	`Header_calculateHeight(this);`
`78`	`78`	`}`
`79`	`79`
`80`		`-static void Header_addMeterByName(Header* this, const char* name, MeterModeId mode, unsigned int column) {`
	`80`	`+static void Header_addMeterByName(Header* this, const char* name, MeterModeId mode, size_t column) {`
`81`	`81`	`assert(column < HeaderLayout_getColumns(this->headerLayout));`
`82`	`82`
`83`	`83`	`Vector* meters = this->columns[column];`
`@@ -170,7 +170,7 @@ void Header_writeBackToSettings(const Header* this) {`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
`173`		`-Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column) {`
	`173`	`+Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, size_t column) {`
`174`	`174`	`assert(column < HeaderLayout_getColumns(this->headerLayout));`
`175`	`175`
`176`	`176`	`Vector* meters = this->columns[column];`
`@@ -198,8 +198,8 @@ void Header_draw(const Header* this) {`
`198`	`198`	`for (int y = 0; y < height; y++) {`
`199`	`199`	`mvhline(y, 0, ' ', COLS);`
`200`	`200`	`}`
`201`		`- const int numCols = HeaderLayout_getColumns(this->headerLayout);`
`202`		`- const int width = COLS - 2 * pad - (numCols - 1);`
	`201`	`+ const size_t numCols = HeaderLayout_getColumns(this->headerLayout);`
	`202`	`+ const int width = COLS - 2 * pad - ((int)numCols - 1);`
`203`	`203`	`int x = pad;`
`204`	`204`	`float roundingLoss = 0.0F;`
`205`	`205`
`@@ -253,7 +253,7 @@ void Header_updateData(Header* this) {`
`253`	`253`	`* by counting how many columns to the right are empty or contain a BlankMeter.`
`254`	`254`	`* Returns the number of columns to span, i.e. if the direct neighbor is occupied 1.`
`255`	`255`	`*/`
`256`		`-static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const unsigned int curColumn, const int curHeight) {`
	`256`	`+static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const size_t curColumn, const int curHeight) {`
`257`	`257`	`for (size_t i = curColumn + 1; i < HeaderLayout_getColumns(this->headerLayout); i++) {`
`258`	`258`	`const Vector* meters = this->columns[i];`
`259`	`259`
`@@ -269,11 +269,11 @@ static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const`
`269`	`269`	`continue;`
`270`	`270`
`271`	`271`	`if (!Object_isA((const Object) meter, (const ObjectClass) &BlankMeter_class))`
`272`		`- return i - curColumn;`
	`272`	`+ return (int)(i - curColumn);`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`276`		`- return HeaderLayout_getColumns(this->headerLayout) - curColumn;`
	`276`	`+ return (int)(HeaderLayout_getColumns(this->headerLayout) - curColumn);`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`int Header_calculateHeight(Header* this) {`
Original file line number	Diff line number	Diff line change
`@@ -892,7 +892,7 @@ static bool Process_setPriority(Process* this, int priority) {`
`892`	`892`	`bool Process_rowChangePriorityBy(Row* super, Arg delta) {`
`893`	`893`	`Process* this = (Process*) super;`
`894`	`894`	`assert(Object_isA((const Object) this, (const ObjectClass) &Process_class));`
`895`		`- return Process_setPriority(this, this->nice + delta.i);`
	`895`	`+ return Process_setPriority(this, (int)this->nice + delta.i);`
`896`	`896`	`}`
`897`	`897`
`898`	`898`	`static bool Process_sendSignal(Process* this, Arg sgn) {`