niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary CMake modules and fixup os/CMakeLists.txt

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-12-20 16:26:15 +01:00
parent 1990007614
commit e25656a4c5
39 changed files with 406 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/core/ddsc/include/ddsc/dds.h
View file

@ -537,8 +537,8 @@ dds_get_status_mask(
_Out_ uint32_t *mask);
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
DDS_EXPORT _Check_return_ dds_return_t
DDS_DEPRECATED_EXPORT dds_get_enabled_status(
DDS_DEPRECATED_EXPORT _Check_return_ dds_return_t
dds_get_enabled_status(
_In_ dds_entity_t entity,
_Out_ uint32_t *mask);
@ -568,8 +568,7 @@ dds_set_status_mask(
_In_ uint32_t mask);
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
DDS_EXPORT dds_return_t
DDS_DEPRECATED_EXPORT
DDS_DEPRECATED_EXPORT dds_return_t
dds_set_enabled_status(
_In_ dds_entity_t entity,
_In_ uint32_t mask);
@ -1115,8 +1114,7 @@ dds_set_topic_filter(
dds_topic_filter_fn filter);
_Pre_satisfies_((topic & DDS_ENTITY_KIND_MASK) == DDS_KIND_TOPIC)
DDS_EXPORT void
DDS_DEPRECATED_EXPORT
DDS_DEPRECATED_EXPORT void
dds_topic_set_filter(
dds_entity_t topic,
dds_topic_filter_fn filter);
@ -1134,8 +1132,7 @@ dds_get_topic_filter(
dds_entity_t topic);
_Pre_satisfies_((topic & DDS_ENTITY_KIND_MASK) == DDS_KIND_TOPIC)
DDS_EXPORT dds_topic_filter_fn
DDS_DEPRECATED_EXPORT
DDS_DEPRECATED_EXPORT dds_topic_filter_fn
dds_topic_get_filter(
dds_entity_t topic);
@ -3145,8 +3142,7 @@ dds_lookup_instance(
const void *data);
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
DDS_EXPORT dds_instance_handle_t
DDS_DEPRECATED_EXPORT
DDS_DEPRECATED_EXPORT dds_instance_handle_t
dds_instance_lookup (
dds_entity_t entity,
const void *data);

5
src/core/ddsc/src/dds_qos.c
View file

@ -533,7 +533,6 @@ void dds_qset_partition
)
{
uint32_t i;
size_t len;
if(!qos) {
DDS_ERROR("Argument qos may not be NULL\n");
@ -558,9 +557,7 @@ void dds_qset_partition
}
for (i = 0; i < n; i++) {
len = strlen (ps[i]) + 1;
qos->partition.strs[i] = dds_alloc (len);
strncpy (qos->partition.strs[i], ps[i], len);
qos->partition.strs[i] = dds_string_dup (ps[i]);
}
qos->present |= QP_PARTITION;
}

14
src/core/ddsc/src/dds_topic.c
View file

@ -458,6 +458,7 @@ dds_create_topic(
nn_plist_t plist;
dds_entity_t hdl;
uint32_t index;
size_t keysz;
if (desc == NULL){
DDS_ERROR("Topic description is NULL");
@ -478,10 +479,9 @@ dds_create_topic(
}
typename = desc->m_typename;
key = (char*) dds_alloc (strlen (name) + strlen (typename) + 2);
strcpy (key, name);
strcat (key, "/");
strcat (key, typename);
keysz = strlen (name) + strlen (typename) + 2;
key = (char*) dds_alloc (keysz);
(void) snprintf(key, keysz, "%s/%s", name, typename);
st = dds_alloc (sizeof (*st));
@ -490,10 +490,8 @@ dds_create_topic(
st->c.status_cb = dds_topic_status_cb;
st->c.status_cb_entity = NULL; /* set by dds_create_topic_arbitrary */
st->c.name_typename = key;
st->c.name = dds_alloc (strlen (name) + 1);
strcpy (st->c.name, name);
st->c.typename = dds_alloc (strlen (typename) + 1);
strcpy (st->c.typename, typename);
st->c.name = dds_string_dup (name);
st->c.typename = dds_string_dup (typename);
st->c.ops = &ddsi_sertopic_ops_default;
st->c.serdata_ops = desc->m_nkeys ? &ddsi_serdata_ops_cdr : &ddsi_serdata_ops_cdr_nokey;
st->c.serdata_basehash = ddsi_sertopic_compute_serdata_basehash (st->c.serdata_ops);

5
src/core/ddsc/tests/config.c
View file

@ -45,9 +45,10 @@ static void config__check_env(
if ( !env_ok ) {
os_result r;
char *envstr;
size_t len = strlen(env_variable) + strlen("=") + strlen(expected_value) + 1;
envstr = os_malloc(strlen(env_variable) + strlen("=") + strlen(expected_value) + 1);
(void) sprintf(envstr, "%s=%s", env_variable, expected_value);
envstr = os_malloc(len);
(void)snprintf(envstr, len, "%s=%s", env_variable, expected_value);
r = os_putenv(envstr);
CU_ASSERT_EQUAL_FATAL(r, os_resultSuccess);

4
src/core/ddsc/tests/participant.c
View file

@ -85,12 +85,12 @@ CU_Test(ddsc_participant, create_with_conf_no_env) {
dds_domainid_t valid_domain=3;
static char env_uri_str[1000];
(void) sprintf(env_uri_str, "%s=%s", DDSC_PROJECT_NAME_NOSPACE_CAPS"_URI", CONFIG_ENV_SIMPLE_UDP);
(void) snprintf(env_uri_str, sizeof(env_uri_str), "%s=%s", DDSC_PROJECT_NAME_NOSPACE_CAPS"_URI", CONFIG_ENV_SIMPLE_UDP);
os_putenv(env_uri_str);
printf("env_uri_str %s\n", env_uri_str);
static char env_mp_str[100];
(void) sprintf(env_mp_str, "%s=%s", "MAX_PARTICIPANTS", CONFIG_ENV_MAX_PARTICIPANTS);
(void) snprintf(env_mp_str, sizeof(env_mp_str), "%s=%s", "MAX_PARTICIPANTS", CONFIG_ENV_MAX_PARTICIPANTS);
os_putenv(env_mp_str);
const char * env_uri = os_getenv(DDSC_PROJECT_NAME_NOSPACE_CAPS"_URI");