options_get_style return const too.

This commit is contained in:
nicm 2017-01-13 11:58:49 +00:00
parent 22a528905d
commit 08d21936e4
3 changed files with 6 additions and 6 deletions

View File

@ -162,7 +162,7 @@ options_set_string(struct options *oo, const char *name, int append,
return (o);
}
char *
const char *
options_get_string(struct options *oo, const char *name)
{
struct options_entry *o;
@ -221,7 +221,7 @@ options_set_style(struct options *oo, const char *name, int append,
return (o);
}
struct grid_cell *
const struct grid_cell *
options_get_style(struct options *oo, const char *name)
{
struct options_entry *o;

View File

@ -182,7 +182,7 @@ style_update_old(struct options *oo, const char *name, struct grid_cell *gc)
void
style_apply(struct grid_cell *gc, struct options *oo, const char *name)
{
struct grid_cell *gcp;
const struct grid_cell *gcp;
memcpy(gc, &grid_default_cell, sizeof *gc);
gcp = options_get_style(oo, name);
@ -195,7 +195,7 @@ style_apply(struct grid_cell *gc, struct options *oo, const char *name)
void
style_apply_update(struct grid_cell *gc, struct options *oo, const char *name)
{
struct grid_cell *gcp;
const struct grid_cell *gcp;
gcp = options_get_style(oo, name);
if (gcp->fg != 8)

4
tmux.h
View File

@ -1630,13 +1630,13 @@ struct options_entry *options_find(struct options *, const char *);
void options_remove(struct options *, const char *);
struct options_entry * printflike(4, 5) options_set_string(struct options *,
const char *, int, const char *, ...);
char *options_get_string(struct options *, const char *);
const char *options_get_string(struct options *, const char *);
struct options_entry *options_set_number(struct options *, const char *,
long long);
long long options_get_number(struct options *, const char *);
struct options_entry *options_set_style(struct options *, const char *, int,
const char *);
struct grid_cell *options_get_style(struct options *, const char *);
const struct grid_cell *options_get_style(struct options *, const char *);
/* options-table.c */
extern const struct options_table_entry options_table[];