debug: remove unneeded 'number' member of 'struct debug_info_cat'
As the debug subsystem number is used as index into the debug_info_cat array, there is no need to store the number explicitly inside the structure again.
This commit is contained in:
parent
d788f6688c
commit
faadfe2b93
|
@ -48,7 +48,6 @@ struct debug_info_cat {
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *color;
|
const char *color;
|
||||||
const char *description;
|
const char *description;
|
||||||
int number;
|
|
||||||
uint8_t loglevel;
|
uint8_t loglevel;
|
||||||
uint8_t enabled;
|
uint8_t enabled;
|
||||||
};
|
};
|
||||||
|
|
15
src/debug.c
15
src/debug.c
|
@ -59,7 +59,7 @@ int debug_parse_category(const char *category)
|
||||||
|
|
||||||
for (i = 0; i < debug_info->num_cat; ++i) {
|
for (i = 0; i < debug_info->num_cat; ++i) {
|
||||||
if (!strcasecmp(debug_info->cat[i].name+1, category))
|
if (!strcasecmp(debug_info->cat[i].name+1, category))
|
||||||
return debug_info->cat[i].number;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -91,14 +91,13 @@ void debug_parse_category_mask(struct debug_target* target, const char *_mask)
|
||||||
|
|
||||||
if (strncasecmp(debug_info->cat[i].name, category_token,
|
if (strncasecmp(debug_info->cat[i].name, category_token,
|
||||||
length) == 0) {
|
length) == 0) {
|
||||||
int number = debug_info->cat[i].number;
|
|
||||||
int level = 0;
|
int level = 0;
|
||||||
|
|
||||||
if (colon)
|
if (colon)
|
||||||
level = atoi(colon+1);
|
level = atoi(colon+1);
|
||||||
|
|
||||||
target->categories[number].enabled = 1;
|
target->categories[i].enabled = 1;
|
||||||
target->categories[number].loglevel = level;
|
target->categories[i].loglevel = level;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} while ((category_token = strtok(NULL, ":")));
|
} while ((category_token = strtok(NULL, ":")));
|
||||||
|
@ -108,12 +107,8 @@ void debug_parse_category_mask(struct debug_target* target, const char *_mask)
|
||||||
|
|
||||||
static const char* color(int subsys)
|
static const char* color(int subsys)
|
||||||
{
|
{
|
||||||
int i = 0;
|
if (subsys < debug_info->num_cat)
|
||||||
|
return debug_info->cat[subsys].color;
|
||||||
for (i = 0; i < debug_info->num_cat; ++i) {
|
|
||||||
if (debug_info->cat[i].number == subsys)
|
|
||||||
return debug_info->cat[i].color;
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue