mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-05 07:15:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: rename str_to_wchars() -> value_to_wchars()

Browse source
This commit is contained in:
Daniel Eklöf 2021-11-05 14:15:55 +01:00
parent 5fb86859df
commit 4aa3d1d5f8
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
config.c
View file

@ -465,21 +465,22 @@ value_to_double(struct context *ctx, double *res)
} }
static bool NOINLINE static bool NOINLINE
str_to_wchars(const char *s, wchar_t **res, struct config *conf, value_to_wchars(struct context *ctx, wchar_t **res)
const char *path, int lineno,
const char *section, const char *key)
{ {
/* TODO: remove! */
struct config *conf = ctx->conf;
*res = NULL; *res = NULL;
size_t chars = mbstowcs(NULL, s, 0); size_t chars = mbstowcs(NULL, ctx->value, 0);
if (chars == (size_t)-1) { if (chars == (size_t)-1) {
LOG_AND_NOTIFY_ERR("%s:%d: [%s].%s: %s is not a valid string value", LOG_AND_NOTIFY_ERR("%s:%d: [%s].%s: %s is not a valid string value",
path, lineno, section, key, s); ctx->path, ctx->lineno, ctx->section, ctx->key, ctx->value);
return false; return false;
} }
*res = xmalloc((chars + 1) * sizeof(wchar_t)); *res = xmalloc((chars + 1) * sizeof(wchar_t));
mbstowcs(*res, s, chars + 1); mbstowcs(*res, ctx->value, chars + 1);
return true; return true;
} }
@ -992,11 +993,9 @@ parse_section_main(struct context *ctx)
else if (strcmp(key, "word-delimiters") == 0) { else if (strcmp(key, "word-delimiters") == 0) {
wchar_t *word_delimiters; wchar_t *word_delimiters;
if (!str_to_wchars(value, &word_delimiters, conf, path, lineno, if (!value_to_wchars(ctx, &word_delimiters))
"main", "word-delimiters"))
{
return false; return false;
}
free(conf->word_delimiters); free(conf->word_delimiters);
conf->word_delimiters = word_delimiters; conf->word_delimiters = word_delimiters;
} }
@ -1006,11 +1005,9 @@ parse_section_main(struct context *ctx)
conf, "jump-label-letters", "label-letters", path, lineno); conf, "jump-label-letters", "label-letters", path, lineno);
wchar_t *letters; wchar_t *letters;
if (!str_to_wchars(value, &letters, conf, path, lineno, if (!value_to_wchars(ctx, &letters))
"main", "label-letters"))
{
return false; return false;
}
free(conf->url.label_letters); free(conf->url.label_letters);
conf->url.label_letters = letters; conf->url.label_letters = letters;
} }
@ -1216,7 +1213,7 @@ parse_section_url(struct context *ctx)
else if (strcmp(key, "label-letters") == 0) { else if (strcmp(key, "label-letters") == 0) {
wchar_t *letters; wchar_t *letters;
if (!str_to_wchars(value, &letters, conf, path, lineno, "url", "letters")) if (!value_to_wchars(ctx, &letters))
return false; return false;
free(conf->url.label_letters); free(conf->url.label_letters);
@ -1289,11 +1286,8 @@ parse_section_url(struct context *ctx)
else if (strcmp(key, "uri-characters") == 0) { else if (strcmp(key, "uri-characters") == 0) {
wchar_t *uri_characters; wchar_t *uri_characters;
if (!str_to_wchars(value, &uri_characters, conf, path, lineno, if (!value_to_wchars(ctx, &uri_characters))
"url", "uri-characters"))
{
return false; return false;
}
free(conf->url.uri_characters); free(conf->url.uri_characters);