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.
diff --git a/include/osmocore/debug.h b/include/osmocore/debug.h
index a165831..0caec28 100644
--- a/include/osmocore/debug.h
+++ b/include/osmocore/debug.h
@@ -48,7 +48,6 @@
const char *name;
const char *color;
const char *description;
- int number;
uint8_t loglevel;
uint8_t enabled;
};
diff --git a/src/debug.c b/src/debug.c
index d10861f..19fc305 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -59,7 +59,7 @@
for (i = 0; i < debug_info->num_cat; ++i) {
if (!strcasecmp(debug_info->cat[i].name+1, category))
- return debug_info->cat[i].number;
+ return i;
}
return -EINVAL;
@@ -91,14 +91,13 @@
if (strncasecmp(debug_info->cat[i].name, category_token,
length) == 0) {
- int number = debug_info->cat[i].number;
int level = 0;
if (colon)
level = atoi(colon+1);
- target->categories[number].enabled = 1;
- target->categories[number].loglevel = level;
+ target->categories[i].enabled = 1;
+ target->categories[i].loglevel = level;
}
}
} while ((category_token = strtok(NULL, ":")));
@@ -108,12 +107,8 @@
static const char* color(int subsys)
{
- int i = 0;
-
- for (i = 0; i < debug_info->num_cat; ++i) {
- if (debug_info->cat[i].number == subsys)
- return debug_info->cat[i].color;
- }
+ if (subsys < debug_info->num_cat)
+ return debug_info->cat[subsys].color;
return NULL;
}