From 31f294e417ed955797e11aefe17d999a2c645926 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 24 Apr 2013 12:09:35 -0500 Subject: [PATCH] FS-5343 --resolve Conflicts: libs/sofia-sip/.update --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 0114190bd8..f4199e3b92 100644 --- 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 2261ff6bac..47e951f144 100644 --- 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; }