fix for bug 1371386, with some minor mods and cleanup

[wxWidgets.git] / src / iodbc / itrace.h

diff --git a/src/iodbc/itrace.h b/src/iodbc/itrace.h
index 4c84a4caf1eb08b8f569fe48def0ef0bf95bfe40..61ba072ec897e7648d7a152818c72b66f62852e5 100644 (file)
--- a/src/iodbc/itrace.h
+++ b/src/iodbc/itrace.h
@@ -1,103 +1,124 @@
-#ifndef _ITRACE_H
-# define _ITRACE_H
+/*
+ *  itrace.h
+ *
+ *  $Id$
+ *
+ *  Trace functions
+ *
+ *  The iODBC driver manager.
+ *  
+ *  Copyright (C) 1995 by Ke Jin <kejin@empress.com> 
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#ifndef        _ITRACE_H
+#define _ITRACE_H

 
 

-# ifdef DEBUG
-#  ifndef NO_TRACE
-#   define NO_TRACE
-#  endif
-# endif
-
-/* never trace, Robert Roebling */
+#ifdef DEBUG

 
 #ifndef NO_TRACE
 #define NO_TRACE
 #endif
 
 
 #ifndef NO_TRACE
 #define NO_TRACE
 #endif
 

-# define TRACE_TYPE_APP2DM      1
-# define TRACE_TYPE_DM2DRV      2
-# define TRACE_TYPE_DRV2DM      3
+#endif
+
+#define TRACE_TYPE_APP2DM      1
+#define TRACE_TYPE_DM2DRV      2
+#define TRACE_TYPE_DRV2DM      3

 
 

-# define TRACE_TYPE_RETURN      4
+#define TRACE_TYPE_RETURN      4

 
 

-extern HPROC    _iodbcdm_gettrproc(void FAR* stm, int procid, int type);
+extern HPROC _iodbcdm_gettrproc (void FAR * stm, int procid, int type);

 
 

-# ifdef NO_TRACE
-#  define TRACE_CALL( stm, trace_on, procid, plist )
-# else
-#  define TRACE_CALL( stm, trace_on, plist )\
-        {\
-                if( trace_on)\
-                {\
-                        HPROC   hproc;\
+#ifdef NO_TRACE
+#define TRACE_CALL( stm, trace_on, procid, plist )
+#else
+#define TRACE_CALL( stm, trace_on, plist )\
+       {\
+               if( trace_on)\
+               {\
+                       HPROC   hproc;\

 \
 \

-                        hproc = _iodbcdm_gettrproc(stm, procid, TRACE_TYPE_APP2DM);\
+                       hproc = _iodbcdm_gettrproc(stm, procid, TRACE_TYPE_APP2DM);\

 \
 \

-                        if( hproc )\
-                                hproc plist;\
-                }\
-        }
-# endif
+                       if( hproc )\
+                               hproc plist;\
+               }\
+       }
+#endif

 
 

-# ifdef NO_TRACE
-#  define TRACE_DM2DRV( stm, procid, plist )
-# else
-#  define TRACE_DM2DRV( stm, procid, plist )\
-        {\
-                HPROC   hproc;\
+#ifdef NO_TRACE
+#define TRACE_DM2DRV( stm, procid, plist )
+#else
+#define TRACE_DM2DRV( stm, procid, plist )\
+       {\
+               HPROC   hproc;\

 \
 \

-                hproc = _iodbcdm_gettrproc(stm, procid, TRACE_TYPE_DM2DRV);\
+               hproc = _iodbcdm_gettrproc(stm, procid, TRACE_TYPE_DM2DRV);\

 \
 \

-                if( hproc )\
-                        hproc plist;\
-        }
-# endif
+               if( hproc )\
+                       hproc plist;\
+       }
+#endif

 
 

-# ifdef NO_TRACE
-#  define TRACE_DRV2DM( stm, procid, plist )
-# else
-#  define TRACE_DRV2DM( stm, procid, plist ) \
-        {\
-                HPROC   hproc;\
+#ifdef NO_TRACE
+#define TRACE_DRV2DM( stm, procid, plist )
+#else
+#define TRACE_DRV2DM( stm, procid, plist ) \
+       {\
+               HPROC   hproc;\

 \
 \

-                hproc = _iodbcdm_gettrproc( stm, procid, TRACE_TYPE_DRV2DM);\
+               hproc = _iodbcdm_gettrproc( stm, procid, TRACE_TYPE_DRV2DM);\

 \
 \

-                if( hproc )\
-                                hproc plist;\
-        }
-# endif
+               if( hproc )\
+                               hproc plist;\
+       }
+#endif

 
 

-# ifdef NO_TRACE
-#  define TRACE_RETURN( stm, trace_on, ret )
-# else
-#  define TRACE_RETURN( stm, trace_on, ret )\
-        {\
-                if( trace_on ) {\
-                        HPROC hproc;\
+#ifdef NO_TRACE
+#define TRACE_RETURN( stm, trace_on, ret )
+#else
+#define TRACE_RETURN( stm, trace_on, ret )\
+       {\
+               if( trace_on ) {\
+                       HPROC hproc;\

 \
 \

-                        hproc = _iodbcdm_gettrproc( stm, 0, TRACE_TYPE_RETURN);\
+                       hproc = _iodbcdm_gettrproc( stm, 0, TRACE_TYPE_RETURN);\

 \
 \

-                        if( hproc )\
-                                hproc( stm, ret );\
-                }\
-        }
-# endif
+                       if( hproc )\
+                               hproc( stm, ret );\
+               }\
+       }
+#endif

 
 

-# ifdef NO_TRACE
-#  define CALL_DRIVER( hdbc, ret, proc, procid, plist ) { ret = proc plist; }
-# else
-#  define CALL_DRIVER( hdbc, ret, proc, procid, plist )\
-        {\
-                DBC_t FAR*      pdbc = (DBC_t FAR*)(hdbc);\
+#ifdef NO_TRACE
+#define CALL_DRIVER( hdbc, ret, proc, procid, plist )  { ret = proc plist; }
+#else
+#define CALL_DRIVER( hdbc, ret, proc, procid, plist )\
+       {\
+               DBC_t FAR*      pdbc = (DBC_t FAR*)(hdbc);\

 \
 \

-                if( pdbc->trace ) {\
-                        TRACE_DM2DRV( pdbc->tstm, procid, plist )\
-                        ret = proc plist;\
-                        TRACE_DRV2DM( pdbc->tstm, procid, plist )\
-                        TRACE_RETURN( pdbc->tstm, 1, ret )\
-                }\
-                else\
-                        ret = proc plist;\
-        }
-# endif
+               if( pdbc->trace ) {\
+                       TRACE_DM2DRV( pdbc->tstm, procid, plist )\
+                       ret = proc plist;\
+                       TRACE_DRV2DM( pdbc->tstm, procid, plist )\
+                       TRACE_RETURN( pdbc->tstm, 1, ret )\
+               }\
+               else\
+                       ret = proc plist;\
+       }
+#endif

 
 #endif
 
 #endif