FS-5343 --resolve

Conflicts:
	libs/sofia-sip/.update

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 0114190bd80c010aa92af74a10d7d7c64bab6d78..f4199e3b92e0032ca6343e868507d3ae4fd25341 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Mar  6 12:57:17 CST 2013
+Wed Apr 24 12:10:37 CDT 2013

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
index 2261ff6bac6697dee80f32db84a3ad1fb6270209..47e951f1445fa3587d639fdd582377e914980dca 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c
@@ -609,7 +609,7 @@ int localinfo4(su_localinfo_t const *hints, su_localinfo_t **rresult)
   ifc.ifc_len = numifs * sizeof (struct ifreq);
   buffer = malloc(sizeof(su_localinfo_t) + ifc.ifc_len + su_xtra);
   if (!buffer) {
-    SU_DEBUG_1(("su_localinfo: memory exhausted\n"));
+    SU_DEBUG_1(("su_localinfo: memory exhausted\n" VA_NONE));
     error = ELI_MEMORY;
     goto err;
   }