zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Settings: use size_t for meter count in header 

Header.c:150:26: error: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Werror,-Wimplicit-int-conversion]
          colSettings->len = len;
                           ~ ^~~
This commit is contained in:
Christian Göttsche 2021-09-04 14:15:47 +02:00 committed by BenBE
parent 53732ab0bb
commit ae1816e563
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Settings.c
View File

@ -29,7 +29,7 @@ void Settings_delete(Settings* this) {
free(this->fields); free(this->fields);
for (unsigned int i = 0; i < HeaderLayout_getColumns(this->hLayout); i++) { for (unsigned int i = 0; i < HeaderLayout_getColumns(this->hLayout); i++) {
if (this->hColumns[i].names) { if (this->hColumns[i].names) {
for (uint8_t j = 0; j < this->hColumns[i].len; j++) for (size_t j = 0; j < this->hColumns[i].len; j++)
free(this->hColumns[i].names[j]); free(this->hColumns[i].names[j]);
free(this->hColumns[i].names); free(this->hColumns[i].names);
} }
@ -329,7 +329,7 @@ static void writeFields(FILE* fd, const ProcessField* fields, Hashtable* columns
static void writeMeters(const Settings* this, FILE* fd, char separator, unsigned int column) { static void writeMeters(const Settings* this, FILE* fd, char separator, unsigned int column) {
const char* sep = ""; const char* sep = "";
for (uint8_t i = 0; i < this->hColumns[column].len; i++) { for (size_t i = 0; i < this->hColumns[column].len; i++) {
fprintf(fd, "%s%s", sep, this->hColumns[column].names[i]); fprintf(fd, "%s%s", sep, this->hColumns[column].names[i]);
sep = " "; sep = " ";
} }
@ -338,7 +338,7 @@ static void writeMeters(const Settings* this, FILE* fd, char separator, unsigned
static void writeMeterModes(const Settings* this, FILE* fd, char separator, unsigned int column) { static void writeMeterModes(const Settings* this, FILE* fd, char separator, unsigned int column) {
const char* sep = ""; const char* sep = "";
for (uint8_t i = 0; i < this->hColumns[column].len; i++) { for (size_t i = 0; i < this->hColumns[column].len; i++) {
fprintf(fd, "%s%d", sep, this->hColumns[column].modes[i]); fprintf(fd, "%s%d", sep, this->hColumns[column].modes[i]);
sep = " "; sep = " ";
} }
@ -587,7 +587,7 @@ void Settings_setHeaderLayout(Settings* this, HeaderLayout hLayout) {
} else if (newColumns < oldColumns) { } else if (newColumns < oldColumns) {
for (unsigned int i = newColumns; i < oldColumns; i++) { for (unsigned int i = newColumns; i < oldColumns; i++) {
if (this->hColumns[i].names) { if (this->hColumns[i].names) {
for (uint8_t j = 0; j < this->hColumns[i].len; j++) for (size_t j = 0; j < this->hColumns[i].len; j++)
free(this->hColumns[i].names[j]); free(this->hColumns[i].names[j]);
free(this->hColumns[i].names); free(this->hColumns[i].names);
} }

2
Settings.h
View File

@ -22,7 +22,7 @@ in the source distribution for its full text.
#define CONFIG_READER_MIN_VERSION 2 #define CONFIG_READER_MIN_VERSION 2
typedef struct { typedef struct {
uint8_t len; size_t len;
char** names; char** names;
int* modes; int* modes;
} MeterColumnSetting; } MeterColumnSetting;