projects
/
project
/
ubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ubox: Initialize conditionally uninitialized variabled
[project/ubox.git]
/
validate
/
validate.c
diff --git
a/validate/validate.c
b/validate/validate.c
index f550e760bf5695eaec73dee0b24b8bc51bcdaeea..e72b8117ecd8b680778b0f5c7637ed6546a7736b 100644
(file)
--- a/
validate/validate.c
+++ b/
validate/validate.c
@@
-173,8
+173,10
@@
dt_type_list(struct dt_state *s, int nargs)
char *p, *str = strdup(s->value);
const char *value = s->value;
char *p, *str = strdup(s->value);
const char *value = s->value;
- if (!str || !nargs)
+ if (!str || !nargs) {
+ free(str);
return false;
return false;
+ }
for (p = strtok(str, " \t"); p; p = strtok(NULL, " \t"))
{
for (p = strtok(str, " \t"); p; p = strtok(NULL, " \t"))
{
@@
-198,7
+200,8
@@
dt_type_list(struct dt_state *s, int nargs)
static bool
dt_type_min(struct dt_state *s, int nargs)
{
static bool
dt_type_min(struct dt_state *s, int nargs)
{
- int n, min;
+ int n;
+ int min = 0;
char *e;
if (dt_getint(0, min))
char *e;
if (dt_getint(0, min))
@@
-213,7
+216,8
@@
dt_type_min(struct dt_state *s, int nargs)
static bool
dt_type_max(struct dt_state *s, int nargs)
{
static bool
dt_type_max(struct dt_state *s, int nargs)
{
- int n, max;
+ int n;
+ int max = 0;
char *e;
if (dt_getint(0, max))
char *e;
if (dt_getint(0, max))
@@
-228,7
+232,9
@@
dt_type_max(struct dt_state *s, int nargs)
static bool
dt_type_range(struct dt_state *s, int nargs)
{
static bool
dt_type_range(struct dt_state *s, int nargs)
{
- int n, min, max;
+ int n;
+ int min = 0;
+ int max = 0;
char *e;
if (dt_getint(0, min) && dt_getint(1, max))
char *e;
if (dt_getint(0, min) && dt_getint(1, max))
@@
-243,7
+249,7
@@
dt_type_range(struct dt_state *s, int nargs)
static bool
dt_type_minlen(struct dt_state *s, int nargs)
{
static bool
dt_type_minlen(struct dt_state *s, int nargs)
{
- int min;
+ int min
= 0
;
if (dt_getint(0, min))
return (strlen(s->value) >= min);
if (dt_getint(0, min))
return (strlen(s->value) >= min);
@@
-254,7
+260,7
@@
dt_type_minlen(struct dt_state *s, int nargs)
static bool
dt_type_maxlen(struct dt_state *s, int nargs)
{
static bool
dt_type_maxlen(struct dt_state *s, int nargs)
{
- int max;
+ int max
= 0
;
if (dt_getint(0, max))
return (strlen(s->value) <= max);
if (dt_getint(0, max))
return (strlen(s->value) <= max);
@@
-265,7
+271,8
@@
dt_type_maxlen(struct dt_state *s, int nargs)
static bool
dt_type_rangelen(struct dt_state *s, int nargs)
{
static bool
dt_type_rangelen(struct dt_state *s, int nargs)
{
- int min, max;
+ int min = 0;
+ int max = 0;
int len = strlen(s->value);
if (dt_getint(0, min) && dt_getint(1, max))
int len = strlen(s->value);
if (dt_getint(0, min) && dt_getint(1, max))
@@
-330,8
+337,8
@@
dt_type_bool(struct dt_state *s, int nargs)
{
int i;
const char *values[] = {
{
int i;
const char *values[] = {
- "0", "off", "false", "no",
- "1", "on", "true", "yes"
+ "0", "off", "false", "no",
"disabled",
+ "1", "on", "true", "yes"
, "enabled"
};
for (i = 0; i < sizeof(values) / sizeof(values[0]); i++)
};
for (i = 0; i < sizeof(values) / sizeof(values[0]); i++)
@@
-344,7
+351,8
@@
dt_type_bool(struct dt_state *s, int nargs)
static bool
dt_type_string(struct dt_state *s, int nargs)
{
static bool
dt_type_string(struct dt_state *s, int nargs)
{
- int min, max;
+ int min = 0;
+ int max = 0;
int len = strlen(s->value);
if (dt_getint(0, min) && (len < min))
int len = strlen(s->value);
if (dt_getint(0, min) && (len < min))
@@
-359,7
+367,8
@@
dt_type_string(struct dt_state *s, int nargs)
static bool
dt_type_hexstring(struct dt_state *s, int nargs)
{
static bool
dt_type_hexstring(struct dt_state *s, int nargs)
{
- int min, max;
+ int min = 0;
+ int max = 0;
int len = strlen(s->value);
const char *p;
int len = strlen(s->value);
const char *p;