Mercurial > hg > octave-lyh
changeset 9930:1ddc25c3623a
libcruft/misc: untabify sources
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 07 Dec 2009 13:17:13 -0500 |
parents | 45c08d7c2c79 |
children | fb6b6fcafa62 |
files | libcruft/ChangeLog libcruft/misc/cquit.c libcruft/misc/f77-fcn.h libcruft/misc/quit.h |
diffstat | 4 files changed, 32 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,7 @@ +2009-12-07 John W. Eaton <jwe@octave.org> + + * misc/cquit.c, misc/f77-fcn.h, misc/quit.h: Untabify. + 2009-12-03 John W. Eaton <jwe@octave.org> * Makefile.am (DISTCLEANFILES): New variable.
--- a/libcruft/misc/cquit.c +++ b/libcruft/misc/cquit.c @@ -101,7 +101,7 @@ if (! SetThreadContext (w32_main_thread, context)) { fprintf (stderr, "%lx: context failed: ctrl-c won't work\n", - GetCurrentThreadId ()); + GetCurrentThreadId ()); fflush (stderr); } DEBUGs ("context captured (or not)"); @@ -120,13 +120,13 @@ DEBUGd ("w32_raise_in_main with signal %d", w32_signal_to_raise); raise (w32_signal_to_raise); DEBUGd ("w32_raise_in_main signal %d returned a value", - w32_signal_to_raise); + w32_signal_to_raise); DEBUGs ("attempting to restore main to pre-signal configuration"); if (w32_restore_thread != NULL) /* Catch leaky threads */ CloseHandle (w32_restore_thread); w32_restore_thread = CreateThread (NULL, 10000, w32_reset_context, - &w32_signal_context, 0, &threadid); + &w32_signal_context, 0, &threadid); if (w32_restore_thread == NULL) { fprintf (stderr, "w32_raise_in_main couldn't create thread\n"); @@ -175,17 +175,17 @@ SuspendThread (w32_main_thread); /* X86 code */ w32_signal_context.ContextFlags - = CONTEXT_FULL|CONTEXT_FLOATING_POINT|CONTEXT_DEBUG_REGISTERS; + = CONTEXT_FULL|CONTEXT_FLOATING_POINT|CONTEXT_DEBUG_REGISTERS; GetThreadContext (w32_main_thread, &w32_signal_context); /* Change the context to w32_raise_in_main. The - context.Eip=&fn trick for setting the program counter is - courtesy of + context.Eip=&fn trick for setting the program counter is + courtesy of - http://fit.c2.com/files/LispPlatform/lisp/clisp-2.28/src/win32aux.d + http://fit.c2.com/files/LispPlatform/lisp/clisp-2.28/src/win32aux.d Auxiliary functions for CLISP on Win32, Bruno Haible - 1997-1999. */ + 1997-1999. */ memcpy (&raise_context, &w32_signal_context, sizeof (CONTEXT)); raise_context.Eip = (DWORD)&w32_raise_in_main; /* X86 code */ @@ -195,7 +195,7 @@ /* Resume main at w32_raise_in_main */ ret = ResumeThread (w32_main_thread); DEBUGd ("main resumed at w32_raise_in_main with suspend count %d", - ret); + ret); } } @@ -205,8 +205,8 @@ /* Capture main context */ w32_main_thread_id = GetCurrentThreadId (); DuplicateHandle (GetCurrentProcess (), GetCurrentThread (), - GetCurrentProcess (), &w32_main_thread, - 0, FALSE, DUPLICATE_SAME_ACCESS); + GetCurrentProcess (), &w32_main_thread, + 0, FALSE, DUPLICATE_SAME_ACCESS); InitializeCriticalSectionAndSpinCount (&w32_thread_setjmp_mutex, 0); }
--- a/libcruft/misc/f77-fcn.h +++ b/libcruft/misc/f77-fcn.h @@ -1,6 +1,6 @@ /* -Copyright (C) 1996, 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +Copyright (C) 1996, 1997, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -57,19 +57,19 @@ f77_exception_encountered = 0; \ octave_save_current_context (saved_context); \ if (octave_set_current_context) \ - { \ - octave_interrupt_immediately = saved_octave_interrupt_immediately; \ + { \ + octave_interrupt_immediately = saved_octave_interrupt_immediately; \ octave_restore_current_context (saved_context); \ - if (f77_exception_encountered) \ - F77_XFCN_ERROR (f, F); \ + if (f77_exception_encountered) \ + F77_XFCN_ERROR (f, F); \ else \ - octave_rethrow_exception (); \ - } \ + octave_rethrow_exception (); \ + } \ else \ { \ - octave_interrupt_immediately++; \ - F77_FUNC (f, F) args; \ - octave_interrupt_immediately--; \ + octave_interrupt_immediately++; \ + F77_FUNC (f, F) args; \ + octave_interrupt_immediately--; \ octave_restore_current_context (saved_context); \ } \ } \ @@ -221,7 +221,7 @@ extern CRUFT_API F77_RET_T F77_FUNC (xstopx, XSTOPX) (F77_CONST_CHAR_ARG_DECL - F77_CHAR_ARG_LEN_DECL) GCC_ATTR_NORETURN; + F77_CHAR_ARG_LEN_DECL) GCC_ATTR_NORETURN; #ifdef __cplusplus }
--- a/libcruft/misc/quit.h +++ b/libcruft/misc/quit.h @@ -154,17 +154,17 @@ octave_save_current_context (saved_context); \ \ if (octave_set_current_context) \ - { \ - octave_restore_current_context (saved_context) + { \ + octave_restore_current_context (saved_context) #define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_2 \ - } \ + } \ else \ - { \ - octave_interrupt_immediately++ + { \ + octave_interrupt_immediately++ #define END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE \ - octave_interrupt_immediately--; \ + octave_interrupt_immediately--; \ octave_restore_current_context (saved_context); \ } \ } \