mirror of
https://github.com/obgm/libcoap.git
synced 2026-11-09 10:32:53 +03:00
Jon Shallow
b4fc68c554
Commented out coap_opt_block_set_m() as it is not used anywhere, and needs to get rewritten if needed. Removed / changed references to coap_opt_const_value() Created a new struct coap_str_const_t to handle const parameters Add in 2 new functions to create / delete the new string type coap_new_str_const() coap_delete_str_const() Added in coap_make_str_const() to help create the necessary string equivalents of the ascii test string. Note that the byte array must be in the local scope. Make coap_string_equal() a macro to handle differing string types Made uri_path a pointer in coap_resource_t Made name and value a pointer in coap_attribute_t Reasoning behind this was triggerred by test t_wellknown3() creating a number of resources, all using the same string buffer, so they all ended up with the same uri-path (last update to uri-path). In the days of hashing uri-path for the lookup would have worked, but the wrong uri-path presented from the resource. Now we always allocate uri-path if application does not want it freed off - and always free it off at time or resource removal. The same is also true for coap_add_attr(). Updated coap_resource_init(), coap_add_attr() and coap_find_attr() to pass in string parameters, rather than use a pointer to data and a length. Where appropriate Replace 'unsigned char' with 'const uint8_t' Replace 'str' with 'coap_str_const_t' Replace 'str' with 'coap_string_t' Prefix with 'const' some type casts Remove 'const' prefix from some type casts
91 lines
2.6 KiB
C
91 lines
2.6 KiB
C
/*
|
|
* str.h -- strings to be used in the CoAP library
|
|
*
|
|
* Copyright (C) 2010-2011 Olaf Bergmann <bergmann@tzi.org>
|
|
*
|
|
* This file is part of the CoAP library libcoap. Please see README for terms
|
|
* of use.
|
|
*/
|
|
|
|
#ifndef _COAP_STR_H_
|
|
#define _COAP_STR_H_
|
|
|
|
#include <string.h>
|
|
|
|
typedef struct coap_string_t {
|
|
size_t length; /* length of string */
|
|
uint8_t *s; /* string data */
|
|
} coap_string_t;
|
|
|
|
typedef struct coap_str_const_t {
|
|
size_t length; /* length of string */
|
|
const uint8_t *s; /* string data */
|
|
} coap_str_const_t;
|
|
|
|
/* For backwards compatability */
|
|
typedef coap_string_t str;
|
|
|
|
#define COAP_SET_STR(st,l,v) { (st)->length = (l), (st)->s = (v); }
|
|
|
|
/**
|
|
* Returns a new string object with at least size+1 bytes storage allocated.
|
|
* The string must be released using coap_delete_string();
|
|
*
|
|
* @param size The size to allocate for the binary string data
|
|
*
|
|
* @return A pointer to the new object or @c NULL on error.
|
|
*/
|
|
coap_string_t *coap_new_string(size_t size);
|
|
|
|
/**
|
|
* Deletes the given string and releases any memory allocated.
|
|
*
|
|
* @param string The string to free off
|
|
*/
|
|
void coap_delete_string(coap_string_t *string);
|
|
|
|
/**
|
|
* Returns a new const string object with at least size+1 bytes storage
|
|
* allocated, and the provided data copied into the string object.
|
|
* The string must be released using coap_delete_str_const();
|
|
*
|
|
* @param size The size to allocate for the binary string data
|
|
*
|
|
* @return A pointer to the new object or @c NULL on error.
|
|
*/
|
|
coap_str_const_t *coap_new_str_const(const uint8_t *data, size_t size);
|
|
|
|
/**
|
|
* Deletes the given const string and releases any memory allocated.
|
|
*
|
|
* @param string The string to free off
|
|
*/
|
|
void coap_delete_str_const(coap_str_const_t *string);
|
|
|
|
/**
|
|
* Take the specified byte array (text) and create a coap_str_const_t *
|
|
*
|
|
* WARNING: The byte array must be in the local scope and not a
|
|
* parameter in the function call as sizeof() will return the size of the
|
|
* pointer, not the size of the byte array, leading to unxepected results.
|
|
*
|
|
* @param string The const byte array to convert to a coap_str_const_t *
|
|
*/
|
|
#define coap_make_str_const(string) \
|
|
(&(coap_str_const_t){.length = sizeof(string)-1,.s = (const uint8_t *)(string)})
|
|
|
|
/**
|
|
* Compares the two strings for equality
|
|
*
|
|
* @param string1 The first string
|
|
* @param string2 The second string
|
|
*
|
|
* @return @c 1 if the strings are equal
|
|
* @c 0 otherwise.
|
|
*/
|
|
#define coap_string_equal(s1,s2) \
|
|
((s1)->length == (s2)->length && ((s1)->length == 0 || \
|
|
memcmp((s1)->s, (s2)->s, (s1)->length) == 0))
|
|
|
|
#endif /* _COAP_STR_H_ */
|