circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Sync the entire xmalloc.[ch] with the other users, but with the addition

Browse Source 
of xrealloc, xvasprintf, xvsnprintf.
This commit is contained in:
nicm
2015-11-18 13:06:54 +00:00
parent ca5e6bf5f2
commit 64571368dc
7 changed files with 125 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
options.c
View File

@ -150,9 +150,9 @@ options_get_string(struct options *oo, const char *name)
struct options_entry *o;
if ((o = options_find(oo, name)) == NULL)
log_fatalx("missing option %s", name);
fatalx("missing option %s", name);
if (o->type != OPTIONS_STRING)
log_fatalx("option %s not a string", name);
fatalx("option %s not a string", name);
return (o->str);
}
@ -180,9 +180,9 @@ options_get_number(struct options *oo, const char *name)
struct options_entry *o;
if ((o = options_find(oo, name)) == NULL)
log_fatalx("missing option %s", name);
fatalx("missing option %s", name);
if (o->type != OPTIONS_NUMBER)
log_fatalx("option %s not a number", name);
fatalx("option %s not a number", name);
return (o->num);
}
@ -220,8 +220,8 @@ options_get_style(struct options *oo, const char *name)
struct options_entry *o;
if ((o = options_find(oo, name)) == NULL)
log_fatalx("missing option %s", name);
fatalx("missing option %s", name);
if (o->type != OPTIONS_STYLE)
log_fatalx("option %s not a style", name);
fatalx("option %s not a style", name);
return (&o->style);
}