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

prefix json functions

Browse Source
This commit is contained in:
Love Hornquist Astrand
2013-07-16 13:06:57 +02:00
parent 72e6a0f383
commit 9f979d20d7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/db.c
View File

@@ -599,7 +599,7 @@ heim_db_commit(heim_db_t db, heim_error_t *error)
heim_release(a); heim_release(a);
goto err; goto err;
} }
journal_contents = heim_copy_serialize(a, 0, error); journal_contents = heim_json_copy_serialize(a, 0, error);
heim_release(a); heim_release(a);
/* Write replay log */ /* 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"); heim_assert(jsondb->fd > -1, "DB not locked when sync attempted");
json = heim_copy_serialize(jsondb->dict, 0, &e); json = heim_json_copy_serialize(jsondb->dict, 0, &e);
if (json == NULL) { if (json == NULL) {
if (error) if (error)
*error = e; *error = e;

4
lib/base/heimbase.h
View File

@@ -368,8 +368,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_object_t heim_json_create_with_bytes(const void *, size_t, size_t,
heim_json_flags_t, heim_json_flags_t,
heim_error_t *); heim_error_t *);
heim_string_t heim_copy_serialize(heim_object_t, heim_json_flags_t, heim_string_t heim_json_copy_serialize(heim_object_t, heim_json_flags_t,
heim_error_t *); heim_error_t *);
/* /*

2
lib/base/json.c
View File

@@ -764,7 +764,7 @@ strbuf_add(void *ctx, const char *str)
#define STRBUF_INIT_SZ 64 #define STRBUF_INIT_SZ 64
heim_string_t heim_string_t
heim_copy_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error) heim_json_copy_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error)
{ {
heim_string_t str; heim_string_t str;
struct strbuf strbuf; struct strbuf strbuf;

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

@@ -65,6 +65,7 @@ HEIMDAL_BASE_1.0 {
heim_get_tid; heim_get_tid;
heim_json_create; heim_json_create;
heim_json_create_with_bytes; heim_json_create_with_bytes;
heim_json_copy_serialize;
heim_null_create; heim_null_create;
heim_number_create; heim_number_create;
heim_number_get_int; heim_number_get_int;
@@ -79,7 +80,6 @@ HEIMDAL_BASE_1.0 {
heim_path_vcopy; heim_path_vcopy;
heim_release; heim_release;
heim_retain; heim_retain;
heim_copy_serialize;
heim_show; heim_show;
heim_sorted_text_file_dbtype; heim_sorted_text_file_dbtype;
heim_string_create; heim_string_create;