From b301e47fb896ea4bb608201fb0bfb0e6780b965a Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Thu, 30 May 2013 18:28:37 -0700 Subject: [PATCH] rename heim_serialize to heim_copy_serialize to follow create/copy/get semantics --- lib/base/db.c | 4 ++-- lib/base/heimbase.h | 4 ++-- lib/base/json.c | 2 +- lib/base/version-script.map | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/base/db.c b/lib/base/db.c index 14e535f33..3767d21fb 100644 --- a/lib/base/db.c +++ b/lib/base/db.c @@ -599,7 +599,7 @@ heim_db_commit(heim_db_t db, heim_error_t *error) heim_release(a); goto err; } - journal_contents = heim_serialize(a, 0, error); + journal_contents = heim_copy_serialize(a, 0, error); heim_release(a); /* Write replay log */ @@ -1491,7 +1491,7 @@ json_db_sync(void *db, heim_error_t *error) heim_assert(jsondb->fd > -1, "DB not locked when sync attempted"); - json = heim_serialize(jsondb->dict, 0, &e); + json = heim_copy_serialize(jsondb->dict, 0, &e); if (json == NULL) { if (error) *error = e; diff --git a/lib/base/heimbase.h b/lib/base/heimbase.h index 4cc0429e9..23a4550f6 100644 --- a/lib/base/heimbase.h +++ b/lib/base/heimbase.h @@ -367,8 +367,8 @@ heim_object_t heim_json_create(const char *, size_t, heim_json_flags_t, heim_object_t heim_json_create_with_bytes(const void *, size_t, size_t, heim_json_flags_t, heim_error_t *); -heim_string_t heim_serialize(heim_object_t, heim_json_flags_t flags, - heim_error_t *); +heim_string_t heim_copy_serialize(heim_object_t, heim_json_flags_t, + heim_error_t *); /* diff --git a/lib/base/json.c b/lib/base/json.c index 391b736b0..d5349d038 100644 --- a/lib/base/json.c +++ b/lib/base/json.c @@ -764,7 +764,7 @@ strbuf_add(void *ctx, const char *str) #define STRBUF_INIT_SZ 64 heim_string_t -heim_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error) +heim_copy_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error) { heim_string_t str; struct strbuf strbuf; diff --git a/lib/base/version-script.map b/lib/base/version-script.map index 21062cf06..ef3d0884b 100644 --- a/lib/base/version-script.map +++ b/lib/base/version-script.map @@ -79,7 +79,7 @@ HEIMDAL_BASE_1.0 { heim_path_vcopy; heim_release; heim_retain; - heim_serialize; + heim_copy_serialize; heim_show; heim_sorted_text_file_dbtype; heim_string_create; -- 2.11.4.GIT