mirror of
https://github.com/obgm/libcoap.git
synced 2026-10-29 14:05:48 +03:00
Jon Shallow
5d32ffe920
As pointed out in issue #368 [1], C++ officially forbids aggregate initialization for non-aggegrates. This change therefore introduces an alternative version (which works for both C and C++) to provide the required functionality. str.c: str.h: Make coap_make_str_const() a function. examples/coap-server.c: Fix parameter type in coap_add_attr() call. src/resource.c: Static variables can no longer make use of coap_make_str_const(). libcoap-2.map: libcoap-2.sym: Make coap_make_str_const() appication visible. Fixes #368. [1] https://github.com/obgm/libcoap/issues/368 Update
116 lines
3.1 KiB
C
116 lines
3.1 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>
|
|
|
|
|
|
/**
|
|
* @defgroup string String handling support
|
|
* API functions for handling strings
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Coap string data definition
|
|
*/
|
|
typedef struct coap_string_t {
|
|
size_t length; /**< length of string */
|
|
uint8_t *s; /**< string data */
|
|
} coap_string_t;
|
|
|
|
/**
|
|
* Coap string data definition with const data
|
|
*/
|
|
typedef struct coap_str_const_t {
|
|
size_t length; /**< length of string */
|
|
const uint8_t *s; /**< string data */
|
|
} coap_str_const_t;
|
|
|
|
#define COAP_SET_STR(st,l,v) { (st)->length = (l), (st)->s = (v); }
|
|
|
|
/**
|
|
* Coap binary data definition
|
|
*/
|
|
typedef struct coap_binary_t {
|
|
size_t length; /**< length of binary data */
|
|
uint8_t *s; /**< binary data */
|
|
} coap_binary_t;
|
|
|
|
/**
|
|
* 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 data The data to put in the new string object.
|
|
* @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);
|
|
|
|
#define COAP_MAX_STR_CONST_FUNC 2
|
|
/**
|
|
* Take the specified string and create a coap_str_const_t *
|
|
*
|
|
* Note: the array is 2 deep as there are up to two callings of
|
|
* coap_make_str_const in a function call. e.g. coap_add_attr().
|
|
* Caution: If there are local variable assignments, these will cycle around
|
|
* the var[COAP_MAX_STR_CONST_FUNC] set. No current examples do this.
|
|
*
|
|
* @param string The const string to convert to a coap_str_const_t *
|
|
*
|
|
* @return A pointer to one of two static variables containing the
|
|
* coap_str_const_t * result
|
|
*/
|
|
coap_str_const_t *coap_make_str_const(const char *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(string1,string2) \
|
|
((string1)->length == (string2)->length && ((string1)->length == 0 || \
|
|
memcmp((string1)->s, (string2)->s, (string1)->length) == 0))
|
|
|
|
/** @} */
|
|
|
|
#endif /* COAP_STR_H_ */
|