CELIX-237: Added support for '/' in method id.
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/313452d3 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/313452d3 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/313452d3 Branch: refs/heads/develop Commit: 313452d347929c9faa9badbc42474955ce1fc99d Parents: c647773 Author: Pepijn Noltes <[email protected]> Authored: Fri Sep 11 14:48:16 2015 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Fri Sep 11 14:48:16 2015 +0200 ---------------------------------------------------------------------- .../dynamic_function_interface/dyn_interface.c | 2 +- .../dynamic_function_interface/json_serializer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/313452d3/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c b/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c index ab436b7..d869d16 100644 --- a/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c +++ b/remote_services/remote_service_admin_dfi/dynamic_function_interface/dyn_interface.c @@ -256,7 +256,7 @@ static int dynInterface_parseMethods(dyn_interface_type *intf, FILE *stream) { ungetc(peek, stream); char *id; - status = dynCommon_parseNameAlsoAccept(stream, "();[{}", &id); + status = dynCommon_parseNameAlsoAccept(stream, "();[{}/", &id); if (status == OK) { status = dynCommon_eatChar(stream, '='); http://git-wip-us.apache.org/repos/asf/celix/blob/313452d3/remote_services/remote_service_admin_dfi/dynamic_function_interface/json_serializer.c ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/dynamic_function_interface/json_serializer.c b/remote_services/remote_service_admin_dfi/dynamic_function_interface/json_serializer.c index aaf5cc3..0fb07fc 100644 --- a/remote_services/remote_service_admin_dfi/dynamic_function_interface/json_serializer.c +++ b/remote_services/remote_service_admin_dfi/dynamic_function_interface/json_serializer.c @@ -215,7 +215,7 @@ static int jsonSerializer_parseSequence(dyn_type *seq, json_t *array, void *seqL int status = OK; size_t size = json_array_size(array); - LOG_DEBUG("Allocating sequence with capacity %zu", size); + //LOG_DEBUG("Allocating sequence with capacity %zu", size); status = dynType_sequence_alloc(seq, seqLoc, (int) size); if (status == OK) { @@ -225,7 +225,7 @@ static int jsonSerializer_parseSequence(dyn_type *seq, json_t *array, void *seqL json_array_foreach(array, index, val) { void *valLoc = NULL; status = dynType_sequence_increaseLengthAndReturnLastLoc(seq, seqLoc, &valLoc); - LOG_DEBUG("Got sequence loc %p", valLoc); + //LOG_DEBUG("Got sequence loc %p", valLoc); if (status == OK) { status = jsonSerializer_parseAny(itemType, valLoc, val);
