Browse Source

MT#55283 use transparent union

Change-Id: I3ab0cc4affb01b7e53d2278e466c37ae7172fd16
pull/1769/head
Richard Fuchs 2 years ago
parent
commit
65c1c28100
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      daemon/redis.c

+ 5
- 5
daemon/redis.c View File

@ -39,7 +39,7 @@ typedef union {
GQueue *q; GQueue *q;
GPtrArray *pa; GPtrArray *pa;
void *v; void *v;
} callback_arg_t;
} callback_arg_t __attribute__ ((__transparent_union__));
struct redis *rtpe_redis; struct redis *rtpe_redis;
@ -1257,16 +1257,16 @@ static int rbpa_cb_simple(str *s, callback_arg_t pap, struct redis_list *list, v
return 0; return 0;
} }
static int json_build_list(GQueue *q, struct call *c, const char *key,
static int json_build_list(callback_arg_t q, struct call *c, const char *key,
unsigned int idx, struct redis_list *list, JsonReader *root_reader) unsigned int idx, struct redis_list *list, JsonReader *root_reader)
{ {
return json_build_list_cb((callback_arg_t) q, c, key, idx, list, rbl_cb_simple, NULL, root_reader);
return json_build_list_cb(q, c, key, idx, list, rbl_cb_simple, NULL, root_reader);
} }
static int json_build_ptra(GPtrArray *q, struct call *c, const char *key, static int json_build_ptra(GPtrArray *q, struct call *c, const char *key,
unsigned int idx, struct redis_list *list, JsonReader *root_reader) unsigned int idx, struct redis_list *list, JsonReader *root_reader)
{ {
return json_build_list_cb((callback_arg_t) q, c, key, idx, list, rbpa_cb_simple, NULL, root_reader);
return json_build_list_cb(q, c, key, idx, list, rbpa_cb_simple, NULL, root_reader);
} }
static int json_get_list_hash(struct redis_list *out, static int json_get_list_hash(struct redis_list *out,
@ -1596,7 +1596,7 @@ static int json_medias(struct call *c, struct redis_list *medias, struct redis_l
if (redis_hash_get_sdes_params(&med->sdes_out, rh, "sdes_out") < 0) if (redis_hash_get_sdes_params(&med->sdes_out, rh, "sdes_out") < 0)
return -1; return -1;
json_build_list_cb((callback_arg_t) NULL, c, "payload_types", i, NULL, rbl_cb_plts_r, med, root_reader);
json_build_list_cb(NULL, c, "payload_types", i, NULL, rbl_cb_plts_r, med, root_reader);
/* XXX dtls */ /* XXX dtls */
/* link monologue */ /* link monologue */


Loading…
Cancel
Save