monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-22 13:25:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use xs_json_load() in some places.

Browse source
This commit is contained in:
default 2023-08-05 14:50:20 +02:00
parent d8f2bb1128
commit 381a2f5b7b
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
data.c
View file

@ -46,14 +46,11 @@ int srv_open(char *basedir, int auto_upgrade)
if ((f = fopen(cfg_file, "r")) == NULL) if ((f = fopen(cfg_file, "r")) == NULL)
error = xs_fmt("ERROR: cannot opening '%s'", cfg_file); error = xs_fmt("ERROR: cannot opening '%s'", cfg_file);
else { else {
xs *cfg_data;
/* read full config file */ /* read full config file */
cfg_data = xs_readall(f); srv_config = xs_json_load(f);
fclose(f); fclose(f);
/* parse */ /* parse */
srv_config = xs_json_loads(cfg_data);
if (srv_config == NULL) if (srv_config == NULL)
error = xs_fmt("ERROR: cannot parse '%s'", cfg_file); error = xs_fmt("ERROR: cannot parse '%s'", cfg_file);
@ -167,22 +164,18 @@ int user_open(snac *snac, const char *uid)
cfg_file = xs_fmt("%s/user.json", snac->basedir); cfg_file = xs_fmt("%s/user.json", snac->basedir);
if ((f = fopen(cfg_file, "r")) != NULL) { if ((f = fopen(cfg_file, "r")) != NULL) {
xs *cfg_data;
/* read full config file */ /* read full config file */
cfg_data = xs_readall(f); snac->config = xs_json_load(f);
fclose(f); fclose(f);
if ((snac->config = xs_json_loads(cfg_data)) != NULL) { if (snac->config != NULL) {
xs *key_file = xs_fmt("%s/key.json", snac->basedir); xs *key_file = xs_fmt("%s/key.json", snac->basedir);
if ((f = fopen(key_file, "r")) != NULL) { if ((f = fopen(key_file, "r")) != NULL) {
xs *key_data; snac->key = xs_json_load(f);
key_data = xs_readall(f);
fclose(f); fclose(f);
if ((snac->key = xs_json_loads(key_data)) != NULL) { if (snac->key != NULL) {
snac->actor = xs_fmt("%s/%s", srv_baseurl, uid); snac->actor = xs_fmt("%s/%s", srv_baseurl, uid);
snac->md5 = xs_md5_hex(snac->actor, strlen(snac->actor)); snac->md5 = xs_md5_hex(snac->actor, strlen(snac->actor));
@ -192,10 +185,10 @@ int user_open(snac *snac, const char *uid)
/* does it have a configuration override? */ /* does it have a configuration override? */
xs *cfg_file_o = xs_fmt("%s/user_o.json", snac->basedir); xs *cfg_file_o = xs_fmt("%s/user_o.json", snac->basedir);
if ((f = fopen(cfg_file_o, "r")) != NULL) { if ((f = fopen(cfg_file_o, "r")) != NULL) {
xs *j = xs_readall(f); snac->config_o = xs_json_load(f);
fclose(f); fclose(f);
if ((snac->config_o = xs_json_loads(j)) == NULL) if (snac->config_o == NULL)
srv_log(xs_fmt("error parsing '%s'", cfg_file_o)); srv_log(xs_fmt("error parsing '%s'", cfg_file_o));
} }