Split statements that should go onto multiple lines

This commit is contained in:
Benny Baumann 2021-07-14 19:11:18 +02:00 committed by BenBE
parent 3bc73aa088
commit e7f8d7bcc9
13 changed files with 36 additions and 14 deletions

View File

@ -227,7 +227,8 @@ static Htop_Reaction actionToggleMergedCommand(State* st) {
static Htop_Reaction actionToggleTreeView(State* st) { static Htop_Reaction actionToggleTreeView(State* st) {
st->settings->treeView = !st->settings->treeView; st->settings->treeView = !st->settings->treeView;
if (!st->settings->allBranchesCollapsed) ProcessList_expandTree(st->pl); if (!st->settings->allBranchesCollapsed)
ProcessList_expandTree(st->pl);
return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR; return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
} }
@ -399,7 +400,8 @@ static Htop_Reaction actionLsof(State* st) {
static Htop_Reaction actionShowLocks(State* st) { static Htop_Reaction actionShowLocks(State* st) {
const Process* p = (Process*) Panel_getSelected((Panel*)st->mainPanel); const Process* p = (Process*) Panel_getSelected((Panel*)st->mainPanel);
if (!p) return HTOP_OK; if (!p)
return HTOP_OK;
ProcessLocksScreen* pls = ProcessLocksScreen_new(p); ProcessLocksScreen* pls = ProcessLocksScreen_new(p);
InfoScreen_run((InfoScreen*)pls); InfoScreen_run((InfoScreen*)pls);
ProcessLocksScreen_delete((Object*)pls); ProcessLocksScreen_delete((Object*)pls);

View File

@ -117,7 +117,8 @@ static void AvailableMetersPanel_addDynamicMeter(ATTR_UNUSED ht_key_t key, void*
DynamicIterator* iter = (DynamicIterator*)data; DynamicIterator* iter = (DynamicIterator*)data;
unsigned int identifier = (iter->offset << 16) | iter->id; unsigned int identifier = (iter->offset << 16) | iter->id;
const char* label = meter->description ? meter->description : meter->caption; const char* label = meter->description ? meter->description : meter->caption;
if (!label) label = meter->name; /* last fallback to name, guaranteed set */ if (!label)
label = meter->name; /* last fallback to name, guaranteed set */
Panel_add(iter->super, (Object*) ListItem_new(label, identifier)); Panel_add(iter->super, (Object*) ListItem_new(label, identifier));
iter->id++; iter->id++;
} }

View File

@ -124,7 +124,8 @@ static CommandLineSettings parseArguments(const char* program, int argc, char**
int opt, opti=0; int opt, opti=0;
/* Parse arguments */ /* Parse arguments */
while ((opt = getopt_long(argc, argv, "hVMCs:td:u::Up:F:H::", long_opts, &opti))) { while ((opt = getopt_long(argc, argv, "hVMCs:td:u::Up:F:H::", long_opts, &opti))) {
if (opt == EOF) break; if (opt == EOF)
break;
switch (opt) { switch (opt) {
case 'h': case 'h':
printHelpFlag(program); printHelpFlag(program);

View File

@ -92,7 +92,9 @@ static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec)
void Platform_gettime_monotonic(uint64_t* msec); void Platform_gettime_monotonic(uint64_t* msec);
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }

View File

@ -89,7 +89,9 @@ static inline void Platform_gettime_monotonic(uint64_t* msec) {
Generic_gettime_monotonic(msec); Generic_gettime_monotonic(msec);
} }
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }

View File

@ -89,7 +89,9 @@ static inline void Platform_gettime_monotonic(uint64_t* msec) {
Generic_gettime_monotonic(msec); Generic_gettime_monotonic(msec);
} }
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }

View File

@ -217,7 +217,8 @@ static void LinuxProcess_writeField(const Process* this, RichString* str, Proces
totalRate = lp->io_rate_write_bps; totalRate = lp->io_rate_write_bps;
else else
totalRate = NAN; totalRate = NAN;
Process_printRate(str, totalRate, coloring); return; Process_printRate(str, totalRate, coloring);
return;
} }
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
case CTID: xSnprintf(buffer, n, "%-8s ", lp->ctid ? lp->ctid : ""); break; case CTID: xSnprintf(buffer, n, "%-8s ", lp->ctid ? lp->ctid : ""); break;

View File

@ -105,7 +105,9 @@ static inline void Platform_gettime_monotonic(uint64_t* msec) {
Generic_gettime_monotonic(msec); Generic_gettime_monotonic(msec);
} }
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }

View File

@ -94,7 +94,9 @@ static inline void Platform_gettime_monotonic(uint64_t* msec) {
Generic_gettime_monotonic(msec); Generic_gettime_monotonic(msec);
} }
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }

View File

@ -87,7 +87,9 @@ static inline void Platform_gettime_monotonic(uint64_t* msec) {
Generic_gettime_monotonic(msec); Generic_gettime_monotonic(msec);
} }
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }

View File

@ -147,7 +147,8 @@ static void PCPProcess_writeField(const Process* this, RichString* str, ProcessF
totalRate = pp->io_rate_write_bps; totalRate = pp->io_rate_write_bps;
else else
totalRate = NAN; totalRate = NAN;
Process_printRate(str, totalRate, coloring); return; Process_printRate(str, totalRate, coloring);
return;
} }
case CGROUP: xSnprintf(buffer, n, "%-10s ", pp->cgroup ? pp->cgroup : ""); break; case CGROUP: xSnprintf(buffer, n, "%-10s ", pp->cgroup ? pp->cgroup : ""); break;
case OOM: xSnprintf(buffer, n, "%4u ", pp->oom); break; case OOM: xSnprintf(buffer, n, "%4u ", pp->oom); break;

View File

@ -128,7 +128,9 @@ IGNORE_WCASTQUAL_BEGIN
IGNORE_WCASTQUAL_END IGNORE_WCASTQUAL_END
} }
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }

View File

@ -78,7 +78,9 @@ static inline void Platform_gettime_monotonic(uint64_t* msec) {
Generic_gettime_monotonic(msec); Generic_gettime_monotonic(msec);
} }
static inline Hashtable* Platform_dynamicMeters(void) { return NULL; } static inline Hashtable* Platform_dynamicMeters(void) {
return NULL;
}
static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { } static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }