Browse Source

MT#55283 use g_auto for ng_buffer

Change-Id: Ic79f4380dcb7cbf23b35ca1bfec70c1986ac4477
pull/1776/head
Richard Fuchs 2 years ago
parent
commit
57a80b4513
3 changed files with 3 additions and 6 deletions
  1. +1
    -1
      daemon/control_ng.c
  2. +1
    -1
      daemon/janus.c
  3. +1
    -4
      include/control_ng.h

+ 1
- 1
daemon/control_ng.c View File

@ -143,7 +143,7 @@ int control_ng_process(str *buf, const endpoint_t *sin, char *addr, const sockad
void (*cb)(str *, str *, const endpoint_t *, const sockaddr_t *, void *), void (*cb)(str *, str *, const endpoint_t *, const sockaddr_t *, void *),
void *p1, struct obj *ref) void *p1, struct obj *ref)
{ {
AUTO_CLEANUP(ng_buffer *ngbuf, ng_buffer_auto_release) = NULL;
g_autoptr(ng_buffer) ngbuf = NULL;
bencode_item_t *dict, *resp; bencode_item_t *dict, *resp;
str cmd = STR_NULL, cookie, data, reply, *to_send, callid; str cmd = STR_NULL, cookie, data, reply, *to_send, callid;
const char *errstr, *resultstr; const char *errstr, *resultstr;


+ 1
- 1
daemon/janus.c View File

@ -1631,7 +1631,7 @@ static const char *janus_trickle(JsonReader *reader, struct janus_session *sessi
// top-level structures first, with auto cleanup // top-level structures first, with auto cleanup
AUTO_CLEANUP(GQueue streams, sdp_streams_free) = G_QUEUE_INIT; AUTO_CLEANUP(GQueue streams, sdp_streams_free) = G_QUEUE_INIT;
AUTO_CLEANUP(ng_buffer *ngbuf, ng_buffer_auto_release) = ng_buffer_new(NULL);
g_autoptr(ng_buffer) ngbuf = ng_buffer_new(NULL);
g_auto(sdp_ng_flags) flags; g_auto(sdp_ng_flags) flags;
call_ng_flags_init(&flags, OP_OTHER); call_ng_flags_init(&flags, OP_OTHER);


+ 1
- 4
include/control_ng.h View File

@ -79,10 +79,7 @@ ng_buffer *ng_buffer_new(struct obj *ref);
INLINE void ng_buffer_release(ng_buffer *ngbuf) { INLINE void ng_buffer_release(ng_buffer *ngbuf) {
obj_put(ngbuf); obj_put(ngbuf);
} }
INLINE void ng_buffer_auto_release(ng_buffer **ngbuf) {
if (*ngbuf)
ng_buffer_release(*ngbuf);
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC(ng_buffer, ng_buffer_release)
extern mutex_t rtpe_cngs_lock; extern mutex_t rtpe_cngs_lock;
extern GHashTable *rtpe_cngs_hash; extern GHashTable *rtpe_cngs_hash;


Loading…
Cancel
Save