Attachment #311001 for bug #414773

View | Details | Raw Unified | Return to bug 414773
Collapse All | Expand All

Lines 31-36 Link Here

(-)kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc (+1 lines)
31	#include <netinet/in.h>	31	#include <netinet/in.h>
32	#include <arpa/inet.h>	32	#include <arpa/inet.h>
33	#include <netdb.h>	33	#include <netdb.h>
		34	#include <unistd.h>
34	#endif	35	#endif
35		36
36	#include <cstring>	37	#include <cstring>

Lines 27-32 Link Here

(-)kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc (+6 lines)
27		27
28	#include "talk/base/ssladapter.h"	28	#include "talk/base/ssladapter.h"
29		29
		30	#ifdef POSIX
		31	extern "C" {
		32	#include <unistd.h>
		33	}
		34	#endif
		35
30	#if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)	36	#if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
31	#ifdef WIN32	37	#ifdef WIN32
32	#define SSL_USE_SCHANNEL 1	38	#define SSL_USE_SCHANNEL 1




}

template<class CTYPE>
size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
  va_list args;
  va_start(args, format);
  size_t len = vsprintfn(buffer, buflen, format, args);
  va_end(args);
  return len;
}

template<class CTYPE>
size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
                 va_list args) {
  int len = vsnprintf(buffer, buflen, format, args);

  return len;
}

template<class CTYPE>
size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
  va_list args;
  va_start(args, format);
  size_t len = vsprintfn(buffer, buflen, format, args);
  va_end(args);
  return len;
}

///////////////////////////////////////////////////////////////////////////////
// Allow safe comparing and copying ascii (not UTF-8) with both wide and
// non-wide character strings.

Return to bug 414773

Lines 198-212 Link Here

(-)kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h (-9 / +9 lines)
198	}	198	}
199		199
200	template<class CTYPE>	200	template<class CTYPE>
201	size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
202	va_list args;
203	va_start(args, format);
204	size_t len = vsprintfn(buffer, buflen, format, args);
205	va_end(args);
206	return len;
207	}
208
209	template<class CTYPE>
210	size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,	201	size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
211	va_list args) {	202	va_list args) {
212	int len = vsnprintf(buffer, buflen, format, args);	203	int len = vsnprintf(buffer, buflen, format, args);
Lines 217-222 Link Here
217	return len;	208	return len;
218	}	209	}
219		210
		211	template<class CTYPE>
		212	size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
		213	va_list args;
		214	va_start(args, format);
		215	size_t len = vsprintfn(buffer, buflen, format, args);
		216	va_end(args);
		217	return len;
		218	}
		219
220	///////////////////////////////////////////////////////////////////////////////	220	///////////////////////////////////////////////////////////////////////////////
221	// Allow safe comparing and copying ascii (not UTF-8) with both wide and	221	// Allow safe comparing and copying ascii (not UTF-8) with both wide and
222	// non-wide character strings.	222	// non-wide character strings.