This commit is contained in:
Ludovic Jacomme 2002-04-25 14:17:37 +00:00
parent f1b0b44402
commit 6561c097f0
40 changed files with 83 additions and 56 deletions

View File

@ -109,7 +109,7 @@
# define autbegin() do { \
\
if ( AUT_DEBUG_ON ) addautdebug(__LINE__,__FILE__); } while (0)
if ( AUT_DEBUG_ON ) addautdebug(__LINE__,basename(__FILE__)); } while (0)
# define autend() do { \
\

View File

@ -45,6 +45,7 @@
# include <signal.h>
# include <stdlib.h>
# include <unistd.h>
# include <libgen.h>
# include <mut.h>
# include "aut.h"

View File

@ -39,6 +39,8 @@
# ifndef AUT_ERROR_H
# define AUT_ERROR_H
# include <libgen.h>
#ifndef __P
# if defined(__STDC__) || defined(__GNUC__)
# define __P(x) x
@ -81,8 +83,10 @@
| |
\------------------------------------------------------------*/
# define auterror( E, V ) (aut_error( (int)(E), (char *)(V), __FILE__, __LINE__ ))
# define autwarning( W, V ) (aut_warning( (int)(W), (char *)(V), __FILE__, __LINE__ ))
# define auterror( E, V ) \
(aut_error( (int)(E), (char *)(V), basename(__FILE__), __LINE__ ))
# define autwarning( W, V ) \
(aut_warning( (int)(W), (char *)(V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -72,11 +72,11 @@
# define B2fError( ERROR, TEXT ) \
\
B2fDisplayError( __FILE__, __LINE__, (ERROR), (TEXT) )
B2fDisplayError( basename(__FILE__), __LINE__, (ERROR), (TEXT) )
# define B2fWarning( WARNING, TEXT ) \
\
B2fDisplayWarning( __FILE__, __LINE__, (WARNING), (TEXT) )
B2fDisplayWarning( basename(__FILE__), __LINE__, (WARNING), (TEXT) )
/*------------------------------------------------------------\
| |

View File

@ -104,9 +104,10 @@
| |
\------------------------------------------------------------*/
# define bdderror( E, V ) (bdd_error( (int)(E), (long)(V), __FILE__, __LINE__ ))
# define bddwarning( W, V1, V2 ) (bdd_warning( (int)(W), (long)(V1), \
(long)(V2), __FILE__, __LINE__ ))
# define bdderror( E, V ) \
(bdd_error( (int)(E), (long)(V), basename(__FILE__), __LINE__ ))
# define bddwarning( W, V1, V2 ) \
(bdd_warning( (int)(W), (long)(V1), (long)(V2), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -91,7 +91,7 @@
# define BoomDebugSaveBehFigure( F, T ) \
\
(BoomDebugLocSaveBehFigure( (F), (T), __FILE__, __LINE__ ))
(BoomDebugLocSaveBehFigure( (F), (T), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |
@ -99,9 +99,9 @@
| |
\------------------------------------------------------------*/
# define IsBoomDebugLevel0() (BoomDebugSearchItem( __FILE__, BOOM_DEBUG_LEVEL0))
# define IsBoomDebugLevel1() (BoomDebugSearchItem( __FILE__, BOOM_DEBUG_LEVEL1))
# define IsBoomDebugLevel2() (BoomDebugSearchItem( __FILE__, BOOM_DEBUG_LEVEL2))
# define IsBoomDebugLevel0() (BoomDebugSearchItem( basename(__FILE__), BOOM_DEBUG_LEVEL0))
# define IsBoomDebugLevel1() (BoomDebugSearchItem( basename(__FILE__), BOOM_DEBUG_LEVEL1))
# define IsBoomDebugLevel2() (BoomDebugSearchItem( basename(__FILE__), BOOM_DEBUG_LEVEL2))
/*------------------------------------------------------------\
| |
@ -109,7 +109,7 @@
| |
\------------------------------------------------------------*/
# define BoomPrintf BoomDebugPrint( __FILE__, __LINE__ ); fprintf
# define BoomPrintf BoomDebugPrint( basename(__FILE__), __LINE__ ); fprintf
/*------------------------------------------------------------\
| |

View File

@ -71,11 +71,11 @@
# define BoomError( ERROR, TEXT ) \
\
BoomDisplayError( __FILE__, __LINE__, (ERROR), (TEXT) )
BoomDisplayError( basename(__FILE__), __LINE__, (ERROR), (TEXT) )
# define BoomWarning( WARNING, TEXT ) \
\
BoomDisplayWarning( __FILE__, __LINE__, (WARNING), (TEXT) )
BoomDisplayWarning( basename(__FILE__), __LINE__, (WARNING), (TEXT) )
/*------------------------------------------------------------\
| |

View File

@ -76,8 +76,10 @@
| |
\------------------------------------------------------------*/
# define btrerror( E, V ) (btr_error( (E), (V), __FILE__, __LINE__ ))
# define btrwarning( W, V1, V2 ) (btr_warning( (W), (V1), (V2), __FILE__, __LINE__ ))
# define btrerror( E, V ) \
(btr_error( (E), (V), basename(__FILE__), __LINE__ ))
# define btrwarning( W, V1, V2 ) \
(btr_warning( (W), (V1), (V2), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -78,10 +78,10 @@
\------------------------------------------------------------*/
# define ctlerror( E, V1, V2 ) \
(ctl_error((int)(E),(char*)(long)(V1),(char*)(long)(V2),__FILE__,__LINE__))
(ctl_error((int)(E),(char*)(long)(V1),(char*)(long)(V2),basename(__FILE__),__LINE__))
# define ctlwarning( E, V1, V2 ) \
(ctl_warning( (int)(E),(char*)(long)(V1),(char*)(long)(V2),__FILE__,__LINE__))
(ctl_warning( (int)(E),(char*)(long)(V1),(char*)(long)(V2),basename(__FILE__),__LINE__))
/*------------------------------------------------------------\
| |

View File

@ -47,6 +47,7 @@
# include <Xm/PushBG.h>
# include <Xm/CascadeBG.h>
# include "mut.h"
# include "mph.h"
# include "rds.h"
# include "rpr.h"

View File

@ -47,6 +47,7 @@
# include <Xm/PushBG.h>
# include <Xm/CascadeBG.h>
# include "mut.h"
# include "mph.h"
# include "rds.h"
# include "rpr.h"

View File

@ -47,6 +47,7 @@
# include <Xm/PushBG.h>
# include <Xm/CascadeBG.h>
# include "mut.h"
# include "mph.h"
# include "rds.h"
# include "rpr.h"

View File

@ -47,6 +47,7 @@
# include <Xm/PushBG.h>
# include <Xm/CascadeBG.h>
# include "mut.h"
# include "mph.h"
# include "rds.h"
# include "rpr.h"

View File

@ -46,6 +46,7 @@
# include <stdio.h>
# include <X11/cursorfont.h>
# include <X11/Intrinsic.h>
# include "mut.h"
# include "rds.h"
# include "GTB.h"
# include "GTB_cursor.h"

View File

@ -48,6 +48,7 @@
# include <Xm/MessageB.h>
# include <Xm/SelectioB.h>
# include <Xm/SeparatoG.h>
# include "mut.h"
# include "rds.h"
# include "GTB.h"
# include "GTB_dialog.h"

View File

@ -45,6 +45,7 @@
# include <Xm/Xm.h>
# include <X11/Intrinsic.h>
# include "mut.h"
# include "rds.h"
# include "GTB.h"
# include "GTB_icon.h"

View File

@ -44,6 +44,7 @@
# include <Xm/SeparatoG.h>
# include <Xm/Separator.h>
# include "mut.h"
# include "rds.h"
# include "GTB.h"
# include "GTB_menu.h"

View File

@ -52,6 +52,7 @@
# include <Xm/Text.h>
# include <Xm/PushB.h>
# include <Xm/DialogS.h>
# include "mut.h"
# include "rds.h"
# include "GTB.h"

View File

@ -39,6 +39,7 @@
# include <Xm/Xm.h>
# include <X11/Intrinsic.h>
# include "mut.h"
# include "rds.h"
# include "GTB.h"

View File

@ -69,7 +69,7 @@
| |
\------------------------------------------------------------*/
# define fkserror( E, V ) (fks_error( (int)(E), (char *)(V), __FILE__, __LINE__ ))
# define fkserror( E, V ) (fks_error( (int)(E), (char *)(V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -66,7 +66,8 @@
| |
\------------------------------------------------------------*/
# define fsmerror( E, V ) (fsm_error( (int)(E), (char *)(V), __FILE__, __LINE__ ))
# define fsmerror( E, V ) \
(fsm_error( (int)(E), (char *)(V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -62,7 +62,7 @@
| |
\------------------------------------------------------------*/
# define FspPrintf FspDebugPrint( __FILE__, __LINE__ ); fprintf
# define FspPrintf FspDebugPrint( basename(__FILE__), __LINE__ ); fprintf
/*------------------------------------------------------------\
| |

View File

@ -71,7 +71,7 @@
| |
\------------------------------------------------------------*/
# define ftlerror( E, V ) (ftl_error( (E), (V), __FILE__, __LINE__ ))
# define ftlerror( E, V ) (ftl_error( (E), (V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -47,7 +47,7 @@
# define C_DEBUG_H
# define c_header_debug() fprintf( stdout, "%s:%d: *%s*\n", \
__FILE__,__LINE__, __FUNCTION__)
basename(__FILE__),__LINE__, __FUNCTION__)
# define c_fprintf c_header_debug(); fprintf
# define loc_c_tree_view_node c_header_debug(); fprintf( stdout, "\n" ); c_tree_view_node
# define loc_c_tree_view_node_list c_header_debug(); fprintf( stdout, "\n" ); c_tree_view_node_list

View File

@ -64,11 +64,11 @@
# define K2fError( ERROR, TEXT ) \
\
K2fDisplayError( __FILE__, __LINE__, (ERROR), (TEXT) )
K2fDisplayError( basename(__FILE__), __LINE__, (ERROR), (TEXT) )
# define K2fWarning( WARNING, TEXT ) \
\
K2fDisplayWarning( __FILE__, __LINE__, (WARNING), (TEXT) )
K2fDisplayWarning( basename(__FILE__), __LINE__, (WARNING), (TEXT) )
/*------------------------------------------------------------\
| |

View File

@ -78,8 +78,10 @@
| |
\------------------------------------------------------------*/
# define LynxError( E, T1, T2 )(lynx_error( (E), (T1), (T2), __FILE__, __LINE__ ))
# define LynxWarning( W, T ) (lynx_warning( (W), (T), __FILE__, __LINE__ ))
# define LynxError( E, T1, T2 ) \
(lynx_error( (E), (T1), (T2), basename(__FILE__), __LINE__ ))
# define LynxWarning( W, T ) \
(lynx_warning( (W), (T), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -66,8 +66,10 @@
| |
\------------------------------------------------------------*/
# define rtderror( E, T, V ) (rtd_error ( (E), (T), (V), __FILE__, __LINE__ ))
# define rtdwarning( E, T, V ) (rtd_warning( (E), (T), (V), __FILE__, __LINE__ ))
# define rtderror( E, T, V ) \
(rtd_error ( (E), (T), (V), basename(__FILE__), __LINE__ ))
# define rtdwarning( E, T, V ) \
(rtd_warning( (E), (T), (V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -76,9 +76,9 @@
\------------------------------------------------------------*/
# define rtlerror( E, V1, V2 ) \
(rtl_error( (int)(E), (char*)(long)(V1), (char*)(long)(V2), __FILE__, __LINE__ ))
(rtl_error( (int)(E), (char*)(long)(V1), (char*)(long)(V2), basename(__FILE__), __LINE__ ))
# define rtlwarning( E, V1, V2 ) \
(rtl_warning( (int)(E), (char*)(long)(V1), (char*)(long)(V2), __FILE__, __LINE__ ))
(rtl_warning( (int)(E), (char*)(long)(V1), (char*)(long)(V2), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -53,7 +53,7 @@
| |
\------------------------------------------------------------*/
# define scherror( E, V ) (sch_error( (E), (V), __FILE__, __LINE__ ))
# define scherror( E, V ) (sch_error( (E), (V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -96,11 +96,11 @@
# define SyfError( ERROR, TEXT ) \
\
SyfDisplayError( __FILE__, __LINE__, (ERROR), (TEXT) )
SyfDisplayError( basename(__FILE__), __LINE__, (ERROR), (TEXT) )
# define SyfWarning( WARNING, T1, T2 ) \
\
SyfDisplayWarning( __FILE__, __LINE__, (WARNING), (T1), (T2) )
SyfDisplayWarning( basename(__FILE__), __LINE__, (WARNING), (T1), (T2) )
/*------------------------------------------------------------\
| |

View File

@ -89,7 +89,7 @@
# define VasyDebugSaveVpnFig( F ) \
\
(VasyDebugLocSaveVpnFig( (F), __FILE__, __LINE__ ))
(VasyDebugLocSaveVpnFig( (F), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |
@ -97,9 +97,9 @@
| |
\------------------------------------------------------------*/
# define IsVasyDebugLevel0() (VasyDebugSearchItem( __FILE__, VASY_DEBUG_LEVEL0))
# define IsVasyDebugLevel1() (VasyDebugSearchItem( __FILE__, VASY_DEBUG_LEVEL1))
# define IsVasyDebugLevel2() (VasyDebugSearchItem( __FILE__, VASY_DEBUG_LEVEL2))
# define IsVasyDebugLevel0() (VasyDebugSearchItem( basename(__FILE__), VASY_DEBUG_LEVEL0))
# define IsVasyDebugLevel1() (VasyDebugSearchItem( basename(__FILE__), VASY_DEBUG_LEVEL1))
# define IsVasyDebugLevel2() (VasyDebugSearchItem( basename(__FILE__), VASY_DEBUG_LEVEL2))
/*------------------------------------------------------------\
| |
@ -107,7 +107,7 @@
| |
\------------------------------------------------------------*/
# define VasyPrintf VasyDebugPrint( __FILE__, __LINE__ ); fprintf
# define VasyPrintf VasyDebugPrint( basename(__FILE__), __LINE__ ); fprintf
/*------------------------------------------------------------\
| |

View File

@ -82,19 +82,19 @@
# define VasyError( E, T ) \
\
VasyDisplayError( __FILE__, __LINE__, (E), (vpnline_list *)0, (T) )
VasyDisplayError( basename(__FILE__), __LINE__, (E), (vpnline_list *)0, (T) )
# define VasyWarning( W, T ) \
\
VasyDisplayWarning( __FILE__, __LINE__, (W), (vpnline_list *)0, (T) )
VasyDisplayWarning( basename(__FILE__), __LINE__, (W), (vpnline_list *)0, (T) )
# define VasyErrorLine( E, L, T ) \
\
VasyDisplayError( __FILE__, __LINE__, (E), (vpnline_list *)(L), (T) )
VasyDisplayError( basename(__FILE__), __LINE__, (E), (vpnline_list *)(L), (T) )
# define VasyWarningLine( W, L, T ) \
\
VasyDisplayWarning( __FILE__, __LINE__, (W), (vpnline_list *)(L), (T) )
VasyDisplayWarning( basename(__FILE__), __LINE__, (W), (vpnline_list *)(L), (T) )
/*------------------------------------------------------------\
| |

View File

@ -179,7 +179,8 @@ static int find_mc(s)
l=strlen(s);
strcpy(loc,s);
while(l--) loc[l]=tolower(loc[l]); /* conversion en minuscules */
pt= (el_mc *) bsearch(loc, (char *)tab_mc,VBL_NB_MC,sizeof(el_mc), strcmp);
pt= (el_mc *) bsearch(loc, (char *)tab_mc,VBL_NB_MC,sizeof(el_mc),
(int (*)(const void *, const void *)) strcmp);
if (pt==NULL) return(-1);
return(pt->kval);

View File

@ -45,9 +45,9 @@
#include "vbl_byacc.h"
#if 1
# define my_fprintf fprintf( stdout, "%s %d : ", __FILE__, __LINE__ ); fprintf
# define my_fprintf fprintf( stdout, "%s %d : ", basename(__FILE__), __LINE__ ); fprintf
# define my_vbl_error(N,V) \
do { fprintf( stderr, "%s %d : ", __FILE__, __LINE__); vbl_error(N,V); } while(0)
do { fprintf( stderr, "%s %d : ", basename(__FILE__), __LINE__); vbl_error(N,V); } while(0)
#else
# define my_fprintf fprintf
# define my_vbl_error vbl_error

View File

@ -67,7 +67,8 @@
| |
\------------------------------------------------------------*/
# define vexerror( E, V ) (vex_error( (int)(E), (char*)(long)(V), __FILE__, __LINE__ ))
# define vexerror( E, V ) \
(vex_error( (int)(E), (char*)(long)(V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -66,8 +66,10 @@
| |
\------------------------------------------------------------*/
# define vpderror( E, T, V ) (vpd_error ( (E), (T), (V), __FILE__, __LINE__ ))
# define vpdwarning( E, T, V ) (vpd_warning( (E), (T), (V), __FILE__, __LINE__ ))
# define vpderror( E, T, V ) \
(vpd_error ( (E), (T), (V), basename(__FILE__), __LINE__ ))
# define vpdwarning( E, T, V ) \
(vpd_warning( (E), (T), (V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -95,10 +95,10 @@
\------------------------------------------------------------*/
# define vpnerror( E, V1, V2 ) \
(vpn_error((int)(E),(char*)(long)(V1),(char*)(long)(V2),__FILE__,__LINE__))
(vpn_error((int)(E),(char*)(long)(V1),(char*)(long)(V2), basename(__FILE__),__LINE__))
# define vpnwarning( E, V1, V2 ) \
(vpn_warning( (int)(E),(char*)(long)(V1),(char*)(long)(V2),__FILE__,__LINE__))
(vpn_warning( (int)(E),(char*)(long)(V1),(char*)(long)(V2), basename(__FILE__),__LINE__))
/*------------------------------------------------------------\
| |

View File

@ -71,7 +71,7 @@
| |
\------------------------------------------------------------*/
# define vtlerror( E, V ) (vtl_error( (E), (V), __FILE__, __LINE__ ))
# define vtlerror( E, V ) (vtl_error( (E), (V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -71,10 +71,10 @@
\------------------------------------------------------------*/
# define vvherror( E, T, V ) \
( vvh_error( (int)(E), (char*)(T), (long)(V), __FILE__, __LINE__ ))
( vvh_error( (int)(E), (char*)(T), (long)(V), basename(__FILE__), __LINE__ ))
# define vvhwarning( E, T, V ) \
( vvh_warning( (int)(E), (char*)(T), (long)(V), __FILE__, __LINE__ ))
( vvh_warning( (int)(E), (char*)(T), (long)(V), basename(__FILE__), __LINE__ ))
/*------------------------------------------------------------\
| |

View File

@ -58,7 +58,7 @@
| |
\------------------------------------------------------------*/
# define XsbError( X, Y, Z ) XsbPrintError( __FILE__, __LINE__, X, Y, Z )
# define XsbError( X, Y, Z ) XsbPrintError( basename(__FILE__), __LINE__, X, Y, Z )
/*------------------------------------------------------------\
| |