提交 752f7956 authored 作者: Chris Rienzo's avatar Chris Rienzo

mod_rayo: fix compiler error to nlsml.c from attempted coverity fix

上级 ae5d8766
/* /*
* mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
* Copyright (C) 2013, Grasshopper * Copyright (C) 2013-2014, Grasshopper
* *
* Version: MPL 1.1 * Version: MPL 1.1
* *
...@@ -318,20 +318,20 @@ static int cdata_hook(void *user_data, char *data, size_t len) ...@@ -318,20 +318,20 @@ static int cdata_hook(void *user_data, char *data, size_t len)
/** /**
* Parse the result, looking for noinput/nomatch/match * Parse the result, looking for noinput/nomatch/match
* @param result the NLSML result to parse * @param nlsml_result the NLSML result to parse
* @param uuid optional UUID for logging * @param uuid optional UUID for logging
* @return true if successful * @return true if successful
*/ */
enum nlsml_match_type nlsml_parse(const char *result, const char *uuid) enum nlsml_match_type nlsml_parse(const char *nlsml_result, const char *uuid)
{ {
struct nlsml_parser parser = { 0 }; struct nlsml_parser parser = { 0 };
int result = NMT_BAD_XML; int result = NMT_BAD_XML;
iksparser *p = NULL; iksparser *p = NULL;
parser.uuid = uuid; parser.uuid = uuid;
if (!zstr(result)) { if (!zstr(nlsml_result)) {
p = iks_sax_new(&parser, tag_hook, cdata_hook); p = iks_sax_new(&parser, tag_hook, cdata_hook);
if (iks_parse(p, result, 0, 1) == IKS_OK) { if (iks_parse(p, nlsml_result, 0, 1) == IKS_OK) {
/* check result */ /* check result */
if (parser.match) { if (parser.match) {
result = NMT_MATCH; result = NMT_MATCH;
...@@ -353,8 +353,10 @@ enum nlsml_match_type nlsml_parse(const char *result, const char *uuid) ...@@ -353,8 +353,10 @@ enum nlsml_match_type nlsml_parse(const char *result, const char *uuid)
switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser.uuid), SWITCH_LOG_INFO, "Missing NLSML result\n"); switch_log_printf(SWITCH_CHANNEL_UUID_LOG(parser.uuid), SWITCH_LOG_INFO, "Missing NLSML result\n");
} }
end: end:
if ( p )
if ( p ) {
iks_parser_delete(p); iks_parser_delete(p);
}
return result; return result;
} }
......
BASE=../../../../..
IKS_DIR=$(BASE)/libs/iksemel
IKS_LA=$(IKS_DIR)/src/libiksemel.la
LOCAL_CFLAGS += -I../ -I$(BASE)/libs/iksemel/include
LOCAL_OBJS= $(PCRE_LA) $(IKS_LA) main.o ../nlsml.o
LOCAL_SOURCES= main.c
include $(BASE)/build/modmake.rules
$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update
@cd $(IKS_DIR) && $(MAKE)
@$(TOUCH_TARGET)
local_all:
libtool --mode=link gcc main.o ../nlsml.o -o test test_nlsml.la
local_clean:
-rm test
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论