emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out the str attribute in the ecolors array to its own array. This way ecolors can be marked const.

Browse Source
This commit is contained in:
Roy Marples 2008-02-01 15:09:59 +00:00
parent 62096f542f
commit f12f3e0641
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libeinfo/libeinfo.c
View File

@ -122,18 +122,18 @@ struct ecolor {
einfo_color_t color; einfo_color_t color;
int def; int def;
const char *name; const char *name;
char *str;
}; };
static char nullstr = '\0'; static char nullstr = '\0';
static struct ecolor ecolors[] = { static const struct ecolor ecolors[] = {
{ ECOLOR_GOOD, GOOD, "good", NULL }, { ECOLOR_GOOD, GOOD, "good" },
{ ECOLOR_WARN, WARN, "warn", NULL }, { ECOLOR_WARN, WARN, "warn" },
{ ECOLOR_BAD, BAD, "bad", NULL }, { ECOLOR_BAD, BAD, "bad" },
{ ECOLOR_HILITE, HILITE, "hilite", NULL }, { ECOLOR_HILITE, HILITE, "hilite" },
{ ECOLOR_BRACKET, BRACKET, "bracket", NULL }, { ECOLOR_BRACKET, BRACKET, "bracket" },
{ ECOLOR_NORMAL, 0, NULL, NULL }, { ECOLOR_NORMAL, 0, NULL },
}; };
static const char *ecolors_str[sizeof(ecolors)/sizeof(ecolors[0])];
static char *flush = NULL; static char *flush = NULL;
static char *up = NULL; static char *up = NULL;
@ -442,9 +442,9 @@ static bool colour_terminal (FILE * __EINFO_RESTRICT f)
_GET_CAP (tmp, _me); _GET_CAP (tmp, _me);
if (tmp[0]) if (tmp[0])
_ASSIGN_CAP (ecolors[i].str) _ASSIGN_CAP (ecolors_str[i])
else else
ecolors[i].str = &nullstr; ecolors_str[i] = &nullstr;
} }
_GET_CAP (tmp, _ce) _GET_CAP (tmp, _ce)
@ -540,7 +540,7 @@ static const char *_ecolor (FILE * __EINFO_RESTRICT f, einfo_color_t color)
for (i = 0; i < sizeof (ecolors) / sizeof (ecolors[0]); i++) { for (i = 0; i < sizeof (ecolors) / sizeof (ecolors[0]); i++) {
if (ecolors[i].color == color) if (ecolors[i].color == color)
return (ecolors[i].str); return (ecolors_str[i]);
} }
return (""); return ("");