[svn-upgrade] Integrating new upstream version, strongswan (4.3.6)

1 files changed, 11 insertions, 11 deletions

diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c
index f110521af..5bba8ec21 100644
--- a/src/libstrongswan/utils/backtrace.c
+++ b/src/libstrongswan/utils/backtrace.c
@@ -33,17 +33,17 @@ typedef struct private_backtrace_t private_backtrace_t;
  * Private data of an backtrace_t object.
  */
 struct private_backtrace_t {
-	
+
 	/**
 	 * Public backtrace_t interface.
 	 */
 	backtrace_t public;
-	
+
 	/**
 	 * Number of stacks frames obtained in stack_frames
 	 */
 	int frame_count;
-	
+
 	/**
 	 * Recorded stack frames.
 	 */
@@ -58,7 +58,7 @@ static void log_(private_backtrace_t *this, FILE *file)
 #ifdef HAVE_BACKTRACE
 	size_t i;
 	char **strings;
-	
+
 	strings = backtrace_symbols(this->frames, this->frame_count);
 
 	fprintf(file, " dumping %d stack frame addresses:\n", this->frame_count);
@@ -66,14 +66,14 @@ static void log_(private_backtrace_t *this, FILE *file)
 	{
 #ifdef HAVE_DLADDR
 		Dl_info info;
-		
+
 		if (dladdr(this->frames[i], &info))
 		{
 			char cmd[1024];
 			FILE *output;
-			char c;
+			int c;
 			void *ptr = this->frames[i];
-			
+
 			if (strstr(info.dli_fname, ".so"))
 			{
 				ptr = (void*)(this->frames[i] - info.dli_fbase);
@@ -136,7 +136,7 @@ static bool contains_function(private_backtrace_t *this, char *function)
 	for (i = 0; i< this->frame_count; i++)
 	{
 		Dl_info info;
-		
+
 		if (dladdr(this->frames[i], &info) && info.dli_sname)
 		{
 			if (streq(info.dli_sname, function))
@@ -165,7 +165,7 @@ backtrace_t *backtrace_create(int skip)
 	private_backtrace_t *this;
 	void *frames[50];
 	int frame_count = 0;
-	
+
 #ifdef HAVE_BACKTRACE
 	frame_count = backtrace(frames, countof(frames));
 #endif /* HAVE_BACKTRACE */
@@ -173,11 +173,11 @@ backtrace_t *backtrace_create(int skip)
 	this = malloc(sizeof(private_backtrace_t) + frame_count * sizeof(void*));
 	memcpy(this->frames, frames + skip, frame_count * sizeof(void*));
 	this->frame_count = frame_count;
-	
+
 	this->public.log = (void(*)(backtrace_t*,FILE*))log_;
 	this->public.contains_function = (bool(*)(backtrace_t*, char *function))contains_function;
 	this->public.destroy = (void(*)(backtrace_t*))destroy;
-	
+
 	return &this->public;
 }