remove useless variables, and argument checks for functions

that can safely handle a NULL argument.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24464 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Luigi Rizzo 20 years ago
parent d7a2c4547b
commit 5522238a7e

@ -1008,9 +1008,7 @@ struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_inf
datastore->info = info; datastore->info = info;
if (uid != NULL) {
datastore->uid = ast_strdup(uid); datastore->uid = ast_strdup(uid);
}
return datastore; return datastore;
} }
@ -1483,11 +1481,9 @@ int ast_answer(struct ast_channel *chan)
if (chan->tech->answer) if (chan->tech->answer)
res = chan->tech->answer(chan); res = chan->tech->answer(chan);
ast_setstate(chan, AST_STATE_UP); ast_setstate(chan, AST_STATE_UP);
if (chan->cdr)
ast_cdr_answer(chan->cdr); ast_cdr_answer(chan->cdr);
break; break;
case AST_STATE_UP: case AST_STATE_UP:
if (chan->cdr)
ast_cdr_answer(chan->cdr); ast_cdr_answer(chan->cdr);
break; break;
} }
@ -3736,14 +3732,13 @@ int ast_tonepair(struct ast_channel *chan, int freq1, int freq2, int duration, i
ast_group_t ast_get_group(char *s) ast_group_t ast_get_group(char *s)
{ {
char *copy;
char *piece; char *piece;
char *c=NULL; char *c;
int start=0, finish=0, x; int start=0, finish=0, x;
ast_group_t group = 0; ast_group_t group = 0;
c = copy = ast_strdupa(s); c = ast_strdupa(s);
if (!copy) if (!c)
return 0; return 0;
while ((piece = strsep(&c, ","))) { while ((piece = strsep(&c, ","))) {

Loading…
Cancel
Save