Merge pull request #1509 from ctiller/perform-callbacks

Cleanup unlock() a little
10 years ago · 0353fadd7c
parent 63733efd73 1d74de996c
commit 0353fadd7c
1 changed files with 2 additions and 5 deletions
--- a/src/core/transport/chttp2_transport.c
+++ b/src/core/transport/chttp2_transport.c
@ -824,12 +824,9 @@ static void unlock(transport *t) {

  /* gather any callbacks that need to be made */
  if (!t->calling_back) {
-    perform_callbacks = prepare_callbacks(t);
-    if (perform_callbacks) {
-      t->calling_back = 1;
-    }
+    t->calling_back = perform_callbacks = prepare_callbacks(t);
    if (cb) {
-      if (t->error_state == ERROR_STATE_SEEN && !t->writing && !t->calling_back) {
+      if (t->error_state == ERROR_STATE_SEEN && !t->writing) {
        call_closed = 1;
        t->calling_back = 1;
        t->cb = NULL; /* no more callbacks */