zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-13 20:44:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary include files from PCPDynamicMeter.c

Browse Source 
Also resolve a few unintended style guide transgressions
in the PCP platform code.
This commit is contained in:
Nathan Scott
2021-07-09 12:42:36 +10:00
parent 9f667f2c74
commit e7aaf79166
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pcp/PCPDynamicMeter.c
View File

@ -10,9 +10,6 @@ in the source distribution for its full text.
#include "pcp/PCPDynamicMeter.h"
#include <math.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include "Object.h"
#include "Platform.h"
@ -51,8 +48,8 @@ static PCPDynamicMetric* PCPDynamicMeter_lookupMetric(PCPDynamicMeters* meters,
return metric;
}
static void PCPDynamicMeter_parseMetric(PCPDynamicMeters* meters, PCPDynamicMeter* meter, const char *path, unsigned int line, char* key, char* value) {
PCPDynamicMetric *metric;
static void PCPDynamicMeter_parseMetric(PCPDynamicMeters* meters, PCPDynamicMeter* meter, const char* path, unsigned int line, char* key, char* value) {
PCPDynamicMetric* metric;
char* p;
if ((p = strchr(key, '.')) == NULL)
@ -109,7 +106,7 @@ static void PCPDynamicMeter_parseMetric(PCPDynamicMeters* meters, PCPDynamicMete
}
// Ensure a valid name for use in a PCP metric name and in htoprc
static void PCPDynamicMeter_validateMeterName(char* key, const char *path, unsigned int line) {
static void PCPDynamicMeter_validateMeterName(char* key, const char* path, unsigned int line) {
char* p = key;
char* end = strrchr(key, ']');
@ -219,12 +216,12 @@ static void PCPDynamicMeter_scanDir(PCPDynamicMeters* meters, char* path) {
if (!dir)
return;
struct dirent *dirent;
struct dirent* dirent;
while ((dirent = readdir(dir)) != NULL) {
if (dirent->d_name[0] == '.')
continue;
char *file = String_cat(path, dirent->d_name);
char* file = String_cat(path, dirent->d_name);
PCPDynamicMeter_parseFile(meters, file);
free(file);
}