[sofia-sip] Build internal tests

libs/sofia-sip/s2check/Makefile.am

@@ -9,6 +9,7 @@
 # Header paths
 
 AM_CPPFLAGS = 		$(INTERNAL_INCLUDES)
+AM_LDFLAGS = -ldl
 
 # ----------------------------------------------------------------------
 # Build targets

libs/sofia-sip/s2check/s2_localinfo.c

@@ -66,7 +66,7 @@ s2_getlocalinfo(su_localinfo_t const *hints,
 		su_localinfo_t **return_localinfo)
 {
   int error = 0, ip4 = 0, ip6 = 0, i;
-  su_localinfo_t *result = NULL, **rr = &result;
+  su_localinfo_t *result = NULL, **rr;
   su_localinfo_t hh[1] = {{ 0 }};
 
   assert(return_localinfo);

libs/sofia-sip/s2check/s2sip.c

@@ -195,13 +195,14 @@ s2_sip_next_request(sip_method_t method, char const *name)
   struct message *m;
 
   for (m = s2sip->received; m; m = m->next) {
-    if (m->sip->sip_request)
+    if (m->sip->sip_request) {
       if (method == sip_method_unknown && name == NULL)
 	return s2_sip_remove_message(m);
 
-    if (m->sip->sip_request->rq_method == method &&
-	strcmp(m->sip->sip_request->rq_method_name, name) == 0)
-      return s2_sip_remove_message(m);
+      if (m->sip->sip_request->rq_method == method &&
+  	strcmp(m->sip->sip_request->rq_method_name, name) == 0)
+        return s2_sip_remove_message(m);
+    }
   }
 
   return NULL;

libs/sofia-sip/s2check/s2tcase.c

@@ -57,7 +57,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name,
       if (strcmp(*patterns, "*")) {
 	printf("%s: selected\n", name);
       }
-      _tcase_add_test(tc, tf, name, signo, start, end);
+      _tcase_add_test(tc, tf, name, signo, 0, start, end);
       return;
     }
   }
@@ -67,7 +67,7 @@ void s2_tcase_add_test(TCase *tc, TFun tf, char const *name,
       if (strcmp(*patterns, "*")) {
 	printf("%s: selected\n", name);
       }
-      _tcase_add_test(tc, tf, name, signo, start, end);
+      _tcase_add_test(tc, tf, name, signo, 0, start, end);
       return;
     }
   }

libs/sofia-sip/s2check/s2time.c

@@ -57,7 +57,7 @@ s2_timed_logger(void *stream, char const *fmt, va_list ap)
 {
   char buffer[4096];
   su_time_t now = su_now();
-  size_t prefix, wrote;
+  size_t prefix;
   int n;
 
   snprintf(buffer, sizeof buffer,
@@ -70,5 +70,5 @@ s2_timed_logger(void *stream, char const *fmt, va_list ap)
   prefix = strlen(buffer);
   n = vsnprintf(buffer + prefix, (sizeof buffer) - prefix, fmt, ap);
   if (n > 0)
-    wrote = fwrite(buffer, prefix + n, 1, stream);
+    fwrite(buffer, prefix + n, 1, stream);
 }