[sofia-sip] Guard `if` in sres_record_compare() and fix braces in sres_resolver_recei...

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 4aee8f62bb8975f819e2fccfdbec148ddc1573e7..de80c1d74e142eb1e6e400cb104188cbb7a1b073 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Feb 19 22:50:10 UTC 2020
+Thu Feb 20 10:09:05 UTC 2020

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
index 07e3e322b4e65add88620f166e34c5f51e71c7f2..d14ed309d30d44569755d91ce0481836b0f819ff 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
@@ -1640,7 +1640,8 @@ sres_record_compare(sres_record_t const *aa, sres_record_t const *bb)
       D = A->a6_prelen - B->a6_prelen; if (D) return D;
       D = !A->a6_prename - !B->a6_prename;
       if (D == 0 && A->a6_prename && B->a6_prename)
-       D = su_strcasecmp(A->a6_prename, B->a6_prename); if (D) return D;
+        D = su_strcasecmp(A->a6_prename, B->a6_prename);
+      if (D) return D;
       return memcmp(&A->a6_suffix, &B->a6_suffix, sizeof A->a6_suffix);
     }
   case sres_type_aaaa:
@@ -3460,7 +3461,7 @@ sres_resolver_receive(sres_resolver_t *res, int socket)
   sres_record_t **reply;
   sres_server_t *dns;
 
-  struct sockaddr_storage from[1] = { 0 };
+  struct sockaddr_storage from[1] = {{0}};
   socklen_t fromlen = sizeof from;
 
   SU_DEBUG_9(("%s(%p, %u) called\n", "sres_resolver_receive",