Silence -Wshorten-64-to-32 warnings

Enabled in LLVM 19

Author: cgzones

Action.c

@@ -401,15 +401,19 @@ static Htop_Reaction actionPrevScreen(State* st) {
 }
 
 Htop_Reaction Action_setScreenTab(State* st, int x) {
+   assert(x >= 0);
+   if (x < 0)
+      return 0;
+   unsigned int pos = x;
    Settings* settings = st->host->settings;
-   int s = 2;
+   unsigned int s = 2;
    for (unsigned int i = 0; i < settings->nScreens; i++) {
-      if (x < s) {
+      if (pos < s) {
          return 0;
       }
       const char* tab = settings->screens[i]->heading;
-      int len = strlen(tab);
-      if (x <= s + len + 1) {
+      size_t len = strlen(tab);
+      if (pos <= s + len + 1) {
          settings->ssIndex = i;
          setActiveScreen(settings, st, i);
          return HTOP_UPDATE_PANELHDR | HTOP_REFRESH | HTOP_REDRAW_BAR;

AffinityPanel.c

@@ -311,7 +311,7 @@ static MaskItem* AffinityPanel_addObject(AffinityPanel* this, hwloc_obj_t obj, u
    }
 
    /* "[x] " + "|- " * depth + ("- ")?(if root node) + name */
-   unsigned width = 4 + 3 * depth + (2 * !depth) + strlen(buf);
+   unsigned width = 4 + 3 * depth + (2 * !depth) + (unsigned)strlen(buf);
    if (width > this->width) {
       this->width = width;
    }
@@ -389,7 +389,7 @@ Panel* AffinityPanel_new(Machine* host, const Affinity* affinity, int* width) {
 
       char number[16];
       xSnprintf(number, 9, "CPU %d", Settings_cpuId(host->settings, i));
-      unsigned cpu_width = 4 + strlen(number);
+      unsigned cpu_width = 4 + (unsigned) strlen(number);
       if (cpu_width > this->width) {
          this->width = cpu_width;
       }

CommandLine.c

@@ -12,6 +12,7 @@ in the source distribution for its full text.
 
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
 #include <getopt.h>
 #include <locale.h>
 #include <stdbool.h>
@@ -204,12 +205,15 @@ static CommandLineStatus parseArguments(int argc, char** argv, CommandLineSettin
             if (!username) {
                flags->userId = geteuid();
             } else if (!Action_setUserOnly(username, &(flags->userId))) {
-               for (const char* itr = username; *itr; ++itr)
-                  if (!isdigit((unsigned char)*itr)) {
-                     fprintf(stderr, "Error: invalid user \"%s\".\n", username);
-                     return STATUS_ERROR_EXIT;
-                  }
-               flags->userId = atol(username);
+               char *endptr;
+               errno = 0;
+               unsigned long res = strtoul(username, &endptr, 10);
+               unsigned castRes = (unsigned) res;
+               if (*endptr != '\0' || res == ULONG_MAX || errno != 0 || castRes != res) {
+                  fprintf(stderr, "Error: invalid user \"%s\".\n", username);
+                  return STATUS_ERROR_EXIT;
+               }
+               flags->userId = castRes;
             }
             break;
          }

DynamicMeter.c

@@ -106,6 +106,7 @@ static void DynamicMeter_getUiName(const Meter* this, char* name, size_t length)
       const char* uiName = meter->caption;
       if (uiName) {
          size_t uiNameLen = strlen(uiName);
+         assert(uiNameLen < 32);
          if (uiNameLen > 2 && uiName[uiNameLen - 2] == ':')
             uiNameLen -= 2;
 

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 size_t width = COLS - 2 * pad - (numCols - 1);
    int x = pad;
    float roundingLoss = 0.0F;
 
@@ -221,7 +221,7 @@ void Header_draw(const Header* this) {
          /* Let meters in text mode expand to the right on empty neighbors;
             except for multi column meters. */
          if (meter->mode == TEXT_METERMODE && !Meter_isMultiColumn(meter)) {
-            for (int j = 1; j < meter->columnWidthCount; j++) {
+            for (size_t j = 1; j < meter->columnWidthCount; j++) {
                actualWidth++; /* separator column */
                actualWidth += (float)width * HeaderLayout_layouts[this->headerLayout].widths[col + j] / 100.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 size_t 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];
 

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);
 

IncSet.h

@@ -24,7 +24,7 @@ typedef enum {
 
 typedef struct IncMode_ {
    char buffer[INCMODE_MAX + 1];
-   int index;
+   size_t index;
    FunctionBar* bar;
    bool isFilter;
 } IncMode;

Meter.c

@@ -54,7 +54,7 @@ static void TextMeterMode_draw(Meter* this, int x, int y, int w) {
    mvaddnstr(y, x, caption, w);
    attrset(CRT_colors[RESET_COLOR]);
 
-   int captionLen = strlen(caption);
+   int captionLen = (int)strlen(caption);
    x += captionLen;
    w -= captionLen;
    if (w <= 0)
@@ -251,7 +251,7 @@ static void GraphMeterMode_draw(Meter* this, int x, int y, int w) {
    // Starting positions of graph data and terminal column
    if ((size_t)w > nValues / 2) {
       x += w - nValues / 2;
-      w = nValues / 2;
+      w = (int)(nValues / 2);
    }
    size_t i = nValues - (size_t)w * 2;
 
@@ -319,7 +319,9 @@ static void LEDMeterMode_draw(Meter* this, int x, int y, int w) {
    attrset(CRT_colors[LED_COLOR]);
    const char* caption = Meter_getCaption(this);
    mvaddstr(yText, x, caption);
-   int xx = x + strlen(caption);
+   size_t capLen = strlen(caption);
+   assert(capLen < 32);
+   int xx = x + (int) MINIMUM(capLen, 32);
    int len = RichString_sizeVal(out);
    for (int i = 0; i < len; i++) {
       int c = RichString_getCharVal(out, i);

Meter.h

@@ -112,7 +112,7 @@ struct Meter_ {
    unsigned int param;
    GraphData drawData;
    int h;
-   int columnWidthCount;      /**< only used internally by the Header */
+   size_t columnWidthCount;      /**< only used internally by the Header */
    uint8_t curItems;
    const int* curAttributes;
    char txtBuffer[METER_TXTBUFFER_LEN];

Panel.c

@@ -455,7 +455,7 @@ HandlerResult Panel_selectByTyping(Panel* this, int ch) {
    char* buffer = this->eventHandlerState;
 
    if (0 < ch && ch < 255 && isgraph((unsigned char)ch)) {
-      int len = strlen(buffer);
+      size_t len = strlen(buffer);
       if (!len) {
          if ('/' == ch) {
             ch = '\001';