kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the linkedlists.h AST_LIST_NEXT macro for modifying the list of results.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-07-11 17:34:30 +00:00
parent 2d3f9ce25b
commit 7e015109a2
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_speech_utils.c
View File

@@ -150,7 +150,7 @@ static struct ast_speech_result *find_result(struct ast_speech_result *results,
if (i == wanted_num) if (i == wanted_num)
break; break;
i++; i++;
} while ((result = result->next)); } while ((result = AST_LIST_NEXT(result, list)));
return result; return result;
} }
@@ -315,11 +315,8 @@ static int speech_read(struct ast_channel *chan, const char *cmd, char *data,
ast_copy_string(buf, "0", len); ast_copy_string(buf, "0", len);
} else if (!strcasecmp(data, "results")) { } else if (!strcasecmp(data, "results")) {
/* Count number of results */ /* Count number of results */
result = speech->results; for (result = speech->results; result; result = AST_LIST_NEXT(result, list))
while (result) {
results++; results++;
result = result->next;
}
snprintf(tmp, sizeof(tmp), "%d", results); snprintf(tmp, sizeof(tmp), "%d", results);
ast_copy_string(buf, tmp, len); ast_copy_string(buf, tmp, len);
} }

2
include/asterisk/speech.h
View File

@@ -110,7 +110,7 @@ struct ast_speech_result {
/*! Matched grammar */ /*! Matched grammar */
char *grammar; char *grammar;
/*! List information */ /*! List information */
struct ast_speech_result *next; AST_LIST_ENTRY(ast_speech_result) list;
}; };
/*! \brief Activate a grammar on a speech structure */ /*! \brief Activate a grammar on a speech structure */

2
res/res_speech.c
View File

@@ -113,7 +113,7 @@ int ast_speech_results_free(struct ast_speech_result *result)
current_result->grammar = NULL; current_result->grammar = NULL;
} }
/* Move on and then free ourselves */ /* Move on and then free ourselves */
current_result = current_result->next; current_result = AST_LIST_NEXT(current_result, list);
ast_free(prev_result); ast_free(prev_result);
prev_result = NULL; prev_result = NULL;
} }