diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2024-07-16 04:34:53 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2024-07-18 14:48:27 +0200 |
| commit | d00a10333f06d30fee93ba3ee033e74dc4ff85bc (patch) | |
| tree | e1e5fe3150dfd4294fdb39d68cd31b16214b39f4 /src | |
| parent | a90a1ed527e89cf26737b6a123070c55c3118923 (diff) | |
Use strnlen to avoid unnecessary work in pgtkfns.c
* src/pgtkfns.c (pgtk_get_defaults_value, pgtk_set_defaults_value):
Factor out new function...
(pgtk_check_resource_key_length): ...to here. Avoid unnecessary work by
using strnlen.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pgtkfns.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/pgtkfns.c b/src/pgtkfns.c index b8e65f4c052..f1c0e5da0f3 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c @@ -1901,13 +1901,19 @@ parse_resource_key (const char *res_key, char *setting_key) return gs; } +static void +pgtk_check_resource_key_length (const char *key) +{ + if (strnlen (key, RESOURCE_KEY_MAX_LEN) >= RESOURCE_KEY_MAX_LEN) + error ("Resource key too long"); +} + const char * pgtk_get_defaults_value (const char *key) { char skey[(RESOURCE_KEY_MAX_LEN + 1) * 2]; - if (strlen (key) >= RESOURCE_KEY_MAX_LEN) - error ("Resource key too long"); + pgtk_check_resource_key_length (key); GSettings *gs = parse_resource_key (key, skey); if (gs == NULL) @@ -1936,8 +1942,7 @@ pgtk_set_defaults_value (const char *key, const char *value) { char skey[(RESOURCE_KEY_MAX_LEN + 1) * 2]; - if (strlen (key) >= RESOURCE_KEY_MAX_LEN) - error ("Resource key too long"); + pgtk_check_resource_key_length (key); GSettings *gs = parse_resource_key (key, skey); if (gs == NULL) |