oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

base: s/addkv_{bool,number,object}/setkv

Browse Source 
Now heim_audit_addkv() correctly supports multiple values, the other functions
that (by design) replace existing values with a single value should use the
heim_audit_setkv prefix.

A subsequent commit could add variants that support multiple values for
non-string types.
This commit is contained in:
Luke Howard
2022-01-04 09:04:58 +11:00
parent c8656863ba
commit b27026996a
10 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/base/log.c
View File

@@ -849,7 +849,7 @@ heim_audit_addkv_timediff(heim_svc_req_desc r, const char *k,
}
void
heim_audit_addkv_bool(heim_svc_req_desc r, const char *k, int v)
heim_audit_setkv_bool(heim_svc_req_desc r, const char *k, int v)
{
heim_string_t key = heim_string_create(k);
heim_number_t value;
@@ -857,8 +857,8 @@ heim_audit_addkv_bool(heim_svc_req_desc r, const char *k, int v)
if (key == NULL)
return;
heim_log(r->hcontext, r->logf, 7, "heim_audit_addkv_bool(): "
"adding kv pair %s=%s", k, v ? "true" : "false");
heim_log(r->hcontext, r->logf, 7, "heim_audit_setkv_bool(): "
"setting kv pair %s=%s", k, v ? "true" : "false");
value = heim_bool_create(v);
heim_dict_set_value(r->kv, key, value);
@@ -867,7 +867,7 @@ heim_audit_addkv_bool(heim_svc_req_desc r, const char *k, int v)
}
void
heim_audit_addkv_number(heim_svc_req_desc r, const char *k, intptr_t v)
heim_audit_setkv_number(heim_svc_req_desc r, const char *k, intptr_t v)
{
heim_string_t key = heim_string_create(k);
heim_number_t value;
@@ -875,8 +875,8 @@ heim_audit_addkv_number(heim_svc_req_desc r, const char *k, intptr_t v)
if (key == NULL)
return;
heim_log(r->hcontext, r->logf, 7, "heim_audit_addkv_number(): "
"adding kv pair %s=%ld", k, v);
heim_log(r->hcontext, r->logf, 7, "heim_audit_setkv_number(): "
"setting kv pair %s=%ld", k, v);
value = heim_number_create(v);
heim_dict_set_value(r->kv, key, value);
@@ -885,7 +885,7 @@ heim_audit_addkv_number(heim_svc_req_desc r, const char *k, intptr_t v)
}
void
heim_audit_addkv_object(heim_svc_req_desc r, const char *k, heim_object_t value)
heim_audit_setkv_object(heim_svc_req_desc r, const char *k, heim_object_t value)
{
heim_string_t key = heim_string_create(k);
heim_string_t descr;
@@ -894,8 +894,8 @@ heim_audit_addkv_object(heim_svc_req_desc r, const char *k, heim_object_t value)
return;
descr = heim_json_copy_serialize(value, 0, NULL);
heim_log(r->hcontext, r->logf, 7, "heim_audit_addkv_object(): "
"adding kv pair %s=%s",
heim_log(r->hcontext, r->logf, 7, "heim_audit_setkv_object(): "
"setting kv pair %s=%s",
k, descr ? heim_string_get_utf8(descr) : "<unprintable>");
heim_dict_set_value(r->kv, key, value);
heim_release(key);

6
lib/base/version-script.map
View File

@@ -29,10 +29,10 @@ HEIMDAL_BASE_1.0 {
heim_array_iterate_reverse_f;
heim_array_set_value;
heim_audit_addkv;
heim_audit_addkv_bool;
heim_audit_addkv_number;
heim_audit_addkv_object;
heim_audit_addkv_timediff;
heim_audit_setkv_bool;
heim_audit_setkv_number;
heim_audit_setkv_object;
heim_audit_addreason;
heim_audit_getkv;
heim_audit_trail;