static int ast_channel_by_name_cb(void *obj, void *arg, void *data, int flags)
{
struct ast_channel *chan = obj;
- const char *name = (flags & OBJ_KEY) ? arg : ast_channel_name((struct ast_channel *)arg);
+ const char *name = arg;
size_t name_len = *(size_t *)data;
int ret = CMP_MATCH;
}
ast_channel_lock(chan);
- if (!name_len && (strcasecmp(ast_channel_name(chan), name) || (name_len && strncasecmp(ast_channel_name(chan), name, name_len)))) {
+
+ if ((!name_len && strcasecmp(ast_channel_name(chan), name)) || (name_len && strncasecmp(ast_channel_name(chan), name, name_len))) {
ret = 0; /* name match failed, keep looking */
}
ast_channel_unlock(chan);
}
ast_channel_lock(chan);
- if (!name_len && (strcasecmp(chan->uniqueid, uniqueid) ||
- (name_len && strncasecmp(chan->uniqueid, uniqueid, name_len)))) {
+ if ((!name_len && strcasecmp(chan->uniqueid, uniqueid)) ||
+ (name_len && strncasecmp(chan->uniqueid, uniqueid, name_len))) {
ret = 0;
}
ast_channel_unlock(chan);