2
0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-04 00:05:10 +00:00

Warning fixes.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4807 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2007-09-18 20:53:42 +00:00
parent 73cdb48635
commit 0ec61f1bc7
2 changed files with 19 additions and 12 deletions

View File

@@ -80,7 +80,7 @@ static struct {
{ "local4", LOG_LOCAL4 }, { "local5", LOG_LOCAL5 }, { "local4", LOG_LOCAL4 }, { "local5", LOG_LOCAL5 },
{ "local6", LOG_LOCAL6 }, { "local7", LOG_LOCAL7 }, { "local6", LOG_LOCAL6 }, { "local7", LOG_LOCAL7 },
{ "daemon", LOG_DAEMON }, { "user", LOG_USER }, { "daemon", LOG_DAEMON }, { "user", LOG_USER },
{ NULL } { NULL, 0 }
}; };
static int static int

View File

@@ -86,8 +86,8 @@ rrdNextChar
static void static void
rrdCheckLabel rrdCheckLabel
(const char *rawLabel, int index) { (const char *rawLabel, int index0) {
char *buffer = rrdLabels[index]; char *buffer = rrdLabels[index0];
int i, j, okay; int i, j, okay;
i = 0; i = 0;
@@ -104,7 +104,7 @@ rrdCheckLabel
j = 0; j = 0;
okay = (i > 0); okay = (i > 0);
while (okay && (j < index)) /* locate duplicates */ while (okay && (j < index0)) /* locate duplicates */
okay = strcmp (rrdLabels[j ++], buffer); okay = strcmp (rrdLabels[j ++], buffer);
while (!okay) { /* uniquify duplicate labels with _? or _?? */ while (!okay) { /* uniquify duplicate labels with _? or _?? */
@@ -128,7 +128,7 @@ rrdCheckLabel
} }
j = 0; j = 0;
okay = 1; okay = 1;
while (okay && (j < index)) while (okay && (j < index0))
okay = strcmp (rrdLabels[j ++], buffer); okay = strcmp (rrdLabels[j ++], buffer);
} }
} }
@@ -274,12 +274,12 @@ rrdInit
struct gr { struct gr {
DataType type; DataType type;
char *h2; const char *h2;
char *image; const char *image;
char *title; const char *title;
char *axisTitle; const char *axisTitle;
char *axisDefn; const char *axisDefn;
char *options; const char *options;
int loadAvg; int loadAvg;
}; };
@@ -357,7 +357,14 @@ static struct gr graphs[] = {
"-s -1w --alt-autoscale", "-s -1w --alt-autoscale",
0 0
}, { }, {
DataType_other DataType_other,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
0
} }
}; };