From 63a6adf1a95b8b369815d7b25ff4929fc285f981 Mon Sep 17 00:00:00 2001
From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 30 Nov 2010 17:46:39 +0000
Subject: [PATCH] Cosmetics (remove uggly windows linefeeds)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8775 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 include/xbt/win32_ucontext.h | 38 ++++++++--------
 src/xbt/win32_ucontext.c     | 85 ++++++++++++++++++------------------
 2 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/include/xbt/win32_ucontext.h b/include/xbt/win32_ucontext.h
index eb4f8d250b..0cc53b69bc 100644
--- a/include/xbt/win32_ucontext.h
+++ b/include/xbt/win32_ucontext.h
@@ -24,23 +24,23 @@
 #define UCONTEXT_H
     
 #include <windows.h>
-    
typedef struct __stack {
-  
void *ss_sp;
-  
size_t ss_size;
-  
int ss_flags;
-
} stack_t;
-

typedef CONTEXT mcontext_t;
-
typedef unsigned long __sigset_t;
-

typedef struct __ucontext {
-  
unsigned long int uc_flags;
-  
struct __ucontext *uc_link;
-  
stack_t uc_stack;
-  
mcontext_t uc_mcontext;
-  
__sigset_t uc_sigmask;
-
} ucontext_t;
-


int getcontext(ucontext_t * ucp);
-
int setcontext(const ucontext_t * ucp);
-
int makecontext(ucontext_t *, void (*)(), int, ...);
-
int swapcontext(ucontext_t *, const ucontext_t *);
-

+    typedef struct __stack {
+  void *ss_sp;
+  size_t ss_size;
+  int ss_flags;
+} stack_t;
+typedef CONTEXT mcontext_t;
+typedef unsigned long __sigset_t;
+typedef struct __ucontext {
+  unsigned long int uc_flags;
+  struct __ucontext *uc_link;
+  stack_t uc_stack;
+  mcontext_t uc_mcontext;
+  __sigset_t uc_sigmask;
+} ucontext_t;
+int getcontext(ucontext_t * ucp);
+int setcontext(const ucontext_t * ucp);
+int makecontext(ucontext_t *, void (*)(), int, ...);
+int swapcontext(ucontext_t *, const ucontext_t *);
+
 #endif  /* UCONTEXT_H */
diff --git a/src/xbt/win32_ucontext.c b/src/xbt/win32_ucontext.c
index 5d49317e1a..5dc89593f6 100644
--- a/src/xbt/win32_ucontext.c
+++ b/src/xbt/win32_ucontext.c
@@ -23,71 +23,70 @@
 #include "win32_ucontext.h"
 int getcontext(ucontext_t * ucp) 
 {
-  
int ret;
-  

+  int ret;
+  
       /* Retrieve the full machine context */ 
       ucp->uc_mcontext.ContextFlags = CONTEXT_FULL;
-  
ret = GetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
-  
return (ret == 0) ? -1 : 0;
-
}
+  ret = GetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
+  return (ret == 0) ? -1 : 0;
+}
 
-

int setcontext(const ucontext_t * ucp) 
+int setcontext(const ucontext_t * ucp) 
 {
-  
int ret;
-  

+  int ret;
+  
       /* Restore the full machine context (already set) */ 
       ret = SetThreadContext(GetCurrentThread(), &ucp->uc_mcontext);
-  
return (ret == 0) ? -1 : 0;
-
}
+  return (ret == 0) ? -1 : 0;
+}
 
-

int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...) 
+int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...) 
 {
-  
int i;
-  
va_list ap;
-  
char *sp;
-  

+  int i;
+  va_list ap;
+  char *sp;
+  
       /* Stack grows down */ 
       sp = (char *) (size_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size;
-  

+  
       /* Reserve stack space for the arguments (maximum possible: argc*(8 bytes per argument)) */ 
       sp -= argc * 8;
-  
if (sp < (char *) ucp->uc_stack.ss_sp) {
-    

+  if (sp < (char *) ucp->uc_stack.ss_sp) {
+    
         /* errno = ENOMEM; */ 
         return -1;
-  
}
-  

+  }
+  
       /* Set the instruction and the stack pointer */ 
       ucp->uc_mcontext.Eip = (unsigned long) func;
-  
ucp->uc_mcontext.Esp = (unsigned long) sp - 4;
-  

+  ucp->uc_mcontext.Esp = (unsigned long) sp - 4;
+  
       /* Save/Restore the full machine context */ 
       ucp->uc_mcontext.ContextFlags = CONTEXT_FULL;
-  

+  
       /* Copy the arguments */ 
       va_start(ap, argc);
-  
for (i = 0; i < argc; i++) {
-    
memcpy(sp, ap, 8);
-    
ap += 8;
-    
sp += 8;
-  
}
-  
va_end(ap);
-  
return 0;
-
}
+  for (i = 0; i < argc; i++) {
+    memcpy(sp, ap, 8);
+    ap += 8;
+    sp += 8;
+  }
+  va_end(ap);
+  return 0;
+}
 
-

int swapcontext(ucontext_t * oucp, const ucontext_t * ucp) 
+int swapcontext(ucontext_t * oucp, const ucontext_t * ucp) 
 {
-  
int ret;
-  
if ((oucp == NULL) || (ucp == NULL)) {
-    

+  int ret;
+  if ((oucp == NULL) || (ucp == NULL)) {
+    
         /*errno = EINVAL; */ 
         return -1;
-  
}
-  
ret = getcontext(oucp);
-  
if (ret == 0) {
-    
ret = setcontext(ucp);
-  
}
-  
return ret;
-
}
+  }
+  ret = getcontext(oucp);
+  if (ret == 0) {
+    ret = setcontext(ucp);
+  }
+  return ret;
+}
 
-


-- 
2.20.1