From 206b22c9f510ecbe16a66ad36ebd37a98fd21046 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Tue, 29 Nov 2011 23:40:14 -0800 Subject: [PATCH] add data object --- base/Makefile.am | 1 + base/data.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++ base/heimbase.h | 22 +++++++++ base/heimbasepriv.h | 1 + 4 files changed, 154 insertions(+) create mode 100644 base/data.c diff --git a/base/Makefile.am b/base/Makefile.am index 66222099d..f4960c3dc 100644 --- a/base/Makefile.am +++ b/base/Makefile.am @@ -18,6 +18,7 @@ dist_libheimbase_la_SOURCES = \ array.c \ baselocl.h \ bool.c \ + data.c \ dict.c \ error.c \ heimbase.c \ diff --git a/base/data.c b/base/data.c new file mode 100644 index 000000000..fc1c4422e --- /dev/null +++ b/base/data.c @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2011 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "baselocl.h" +#include + +static void +data_dealloc(void *ptr) +{ +} + +static int +data_cmp(void *a, void *b) +{ + heim_octet_string *osa = a, *osb = b; + if (osa->length != osb->length) + return osa->length - osb->length; + return memcmp(osa->data, osb->data, osa->length); +} + +static unsigned long +data_hash(void *ptr) +{ + heim_octet_string *os = ptr; + const unsigned char *s = os->data; + + if (os->length < 4) + return os->length; + return s[0] | (s[1] << 8) | + (s[os->length - 2] << 16) | (s[os->length - 1] << 24); +} + +struct heim_type_data _heim_data_object = { + HEIM_TID_DATA, + "data-object", + NULL, + data_dealloc, + NULL, + data_cmp, + data_hash +}; + +/** + * Create a data object + * + * @param string the string to create, must be an utf8 string + * + * @return string object + */ + +heim_data_t +heim_data_create(const void *data, size_t length) +{ + heim_octet_string *os; + + os = _heim_alloc_object(&_heim_data_object, sizeof(*os) + length); + if (os) { + os->data = (uint8_t *)os + sizeof(*os); + os->length = length; + memcpy(os->data, data, length); + } + return (heim_data_t)os; +} + +/** + * Return the type ID of data objects + * + * @return type id of string objects + */ + +heim_tid_t +heim_data_get_type_id(void) +{ + return HEIM_TID_DATA; +} + +/** + * Get the data value of the content. + * + * @param data the data object to get the value from + * + * @return a heim_octet_string + */ + +const heim_octet_string * +heim_data_get_data(heim_data_t data) +{ + return (const heim_octet_string *)data; +} + +const void * +heim_data_get_ptr(heim_data_t data) +{ + return ((const heim_octet_string *)data)->data; +} + +size_t heim_data_get_length(heim_data_t data) +{ + return ((const heim_octet_string *)data)->length; +} diff --git a/base/heimbase.h b/base/heimbase.h index eee1a9a97..685c5c57d 100644 --- a/base/heimbase.h +++ b/base/heimbase.h @@ -213,5 +213,27 @@ heim_error_t heim_error_append(heim_error_t, heim_error_t); heim_object_t heim_json_create(const char *, heim_error_t *); heim_object_t heim_json_create_with_bytes(const void *, size_t, heim_error_t *); +/* + * + */ + +#ifndef __HEIM_OCTET_STRING__ +#define __HEIM_OCTET_STRING__ +typedef struct heim_octet_string { + size_t length; + void *data; +} heim_octet_string; +#endif + +typedef struct heim_data * heim_data_t; + +heim_data_t heim_data_create(const void *, size_t); +heim_tid_t heim_data_get_type_id(void); +const heim_octet_string * + heim_data_get_data(heim_data_t); +const void * heim_data_get_ptr(heim_data_t); +size_t heim_data_get_length(heim_data_t); + + #endif /* HEIM_BASE_H */ diff --git a/base/heimbasepriv.h b/base/heimbasepriv.h index 83a2c5649..b06b010ad 100644 --- a/base/heimbasepriv.h +++ b/base/heimbasepriv.h @@ -55,6 +55,7 @@ enum { HEIM_TID_STRING = 131, HEIM_TID_AUTORELEASE = 132, HEIM_TID_ERROR = 133, + HEIM_TID_DATA = 134, HEIM_TID_USER = 255 }; -- 2.11.4.GIT