kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove variable declarations in the middle of two blocks.

Browse Source 
While at it, normalize the surrounding code.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-05-03 18:22:04 +00:00
parent 5522238a7e
commit 2d5900391b
1 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
funcs/func_realtime.c
View File

@@ -53,13 +53,11 @@ static char *tdesc = "Read/Write values from a RealTime repository";
static int function_realtime_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) static int function_realtime_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len)
{ {
struct ast_variable *var=NULL,*head=NULL; struct ast_variable *var, *head;
struct localuser *u; struct localuser *u;
char *results; char *results;
unsigned int resultslen=0; unsigned int resultslen=0;
LOCAL_USER_ADD(u);
AST_DECLARE_APP_ARGS(args, AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(family); AST_APP_ARG(family);
AST_APP_ARG(fieldmatch); AST_APP_ARG(fieldmatch);
@@ -68,36 +66,31 @@ static int function_realtime_read(struct ast_channel *chan, char *cmd, char *dat
AST_APP_ARG(delim2); AST_APP_ARG(delim2);
); );
if (ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Syntax: REALTIME(family|fieldmatch[|value[|delim1[|delim2]]]) - missing argument!\n"); ast_log(LOG_WARNING, "Syntax: REALTIME(family|fieldmatch[|value[|delim1[|delim2]]]) - missing argument!\n");
LOCAL_USER_REMOVE(u);
return -1; return -1;
} else }
AST_STANDARD_APP_ARGS(args, data); LOCAL_USER_ADD(u);
AST_STANDARD_APP_ARGS(args, data);
if (!args.delim1) if (!args.delim1)
args.delim1 = "|"; args.delim1 = "|";
if (!args.delim2) if (!args.delim2)
args.delim2 = "="; args.delim2 = "=";
var = ast_load_realtime(args.family, args.fieldmatch, args.value, NULL); head = ast_load_realtime(args.family, args.fieldmatch, args.value, NULL);
if (var) { if (!head) {
head = var;
while (var) {
resultslen += strlen(var->name) + strlen(var->value) + 2;
var = var->next;
}
var = head;
results = alloca(resultslen);
while (var) {
ast_build_string(&results, &resultslen, "%s%s%s%s", var->name, args.delim2, var->value, args.delim1);
var = var->next;
}
} else {
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return -1; return -1;
} }
for (var = head; var; var = var->next)
resultslen += strlen(var->name) + strlen(var->value) + 2;
results = alloca(resultslen);
for (var = head; var; var = var->next)
ast_build_string(&results, &resultslen, "%s%s%s%s", var->name, args.delim2, var->value, args.delim1);
ast_copy_string(buf, results, len); ast_copy_string(buf, results, len);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
@@ -109,7 +102,6 @@ static int function_realtime_write(struct ast_channel *chan, char *cmd, char *da
struct localuser *u; struct localuser *u;
int res = 0; int res = 0;
LOCAL_USER_ADD(u);
AST_DECLARE_APP_ARGS(args, AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(family); AST_APP_ARG(family);
@@ -120,10 +112,11 @@ static int function_realtime_write(struct ast_channel *chan, char *cmd, char *da
if (ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Syntax: REALTIME(family|fieldmatch|value|newcol) - missing argument!\n"); ast_log(LOG_WARNING, "Syntax: REALTIME(family|fieldmatch|value|newcol) - missing argument!\n");
LOCAL_USER_REMOVE(u);
return -1; return -1;
} else }
AST_STANDARD_APP_ARGS(args, data);
LOCAL_USER_ADD(u);
AST_STANDARD_APP_ARGS(args, data);
res = ast_update_realtime(args.family, args.fieldmatch, args.value, args.field, (char *)value, NULL); res = ast_update_realtime(args.family, args.fieldmatch, args.value, args.field, (char *)value, NULL);
@@ -155,9 +148,7 @@ struct ast_custom_function realtime_function = {
static int unload_module(void *mod) static int unload_module(void *mod)
{ {
int res = 0; int res = ast_custom_function_unregister(&realtime_function);
res |= ast_custom_function_unregister(&realtime_function);
STANDARD_HANGUP_LOCALUSERS; STANDARD_HANGUP_LOCALUSERS;
@@ -166,9 +157,7 @@ static int unload_module(void *mod)
static int load_module(void *mod) static int load_module(void *mod)
{ {
int res = 0; int res = ast_custom_function_register(&realtime_function);
res |= ast_custom_function_register(&realtime_function);
return res; return res;
} }