From 61950d09adabf49be8ad554aa3fe8aa3ab6376c1 Mon Sep 17 00:00:00 2001 From: Ludovic Jacomme Date: Thu, 25 Apr 2002 14:13:59 +0000 Subject: [PATCH] Modif des fonctions rdserror et rdswarning : en remplacant __FILE__ par basename( __FILE__ ) --- alliance/src/rds/src/rds.h | 2 +- alliance/src/rds/src/rdserror.h | 2 +- alliance/src/rds/src/rfmerror.h | 2 +- alliance/src/rds/src/rprerror.h | 2 +- alliance/src/rds/src/rtlerror.h | 2 +- alliance/src/rds/src/ruterror.h | 4 +++- alliance/src/rds/src/rwierror.h | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/alliance/src/rds/src/rds.h b/alliance/src/rds/src/rds.h index 8ec6e71a..971e9f1c 100644 --- a/alliance/src/rds/src/rds.h +++ b/alliance/src/rds/src/rds.h @@ -484,7 +484,7 @@ \ do \ { \ - if ( RDS_DEBUG_ON ) addrdsdebug(__LINE__,__FILE__); \ + if ( RDS_DEBUG_ON ) addrdsdebug(__LINE__, basename(__FILE__)); \ } \ while ( 0 ) diff --git a/alliance/src/rds/src/rdserror.h b/alliance/src/rds/src/rdserror.h index 84ff1f2f..17bcf80c 100644 --- a/alliance/src/rds/src/rdserror.h +++ b/alliance/src/rds/src/rdserror.h @@ -44,7 +44,7 @@ | | \------------------------------------------------------------*/ -# define rdserror( E, V ) (rds_error( (E), (V), __FILE__, __LINE__ )) +# define rdserror( E, V ) (rds_error( (E), (V), basename(__FILE__), __LINE__ )) /*------------------------------------------------------------\ | | diff --git a/alliance/src/rds/src/rfmerror.h b/alliance/src/rds/src/rfmerror.h index 9a89e1c1..90c04798 100644 --- a/alliance/src/rds/src/rfmerror.h +++ b/alliance/src/rds/src/rfmerror.h @@ -41,7 +41,7 @@ | | \------------------------------------------------------------*/ -# define rfmerror( E, V ) (rfm_error( (E), (V), __FILE__, __LINE__ )) +# define rfmerror( E, V ) (rfm_error( (E), (V), basename(__FILE__), __LINE__ )) /*------------------------------------------------------------\ | | diff --git a/alliance/src/rds/src/rprerror.h b/alliance/src/rds/src/rprerror.h index acbb72ca..abde573b 100644 --- a/alliance/src/rds/src/rprerror.h +++ b/alliance/src/rds/src/rprerror.h @@ -66,7 +66,7 @@ | | \------------------------------------------------------------*/ -# define rprerror( E, V, D ) (rpr_error( (E), (V), (D), __FILE__, __LINE__ )) +# define rprerror( E, V, D ) (rpr_error( (E), (V), (D), basename(__FILE__), __LINE__ )) /*------------------------------------------------------------\ | | diff --git a/alliance/src/rds/src/rtlerror.h b/alliance/src/rds/src/rtlerror.h index b327ba0c..7214cfa6 100644 --- a/alliance/src/rds/src/rtlerror.h +++ b/alliance/src/rds/src/rtlerror.h @@ -45,7 +45,7 @@ | | \------------------------------------------------------------*/ -# define rtlerror( E, V ) (rtl_error( (E), (V), __FILE__, __LINE__ )) +# define rtlerror( E, V ) (rtl_error( (E), (V), basename(__FILE__), __LINE__ )) /*------------------------------------------------------------\ | | diff --git a/alliance/src/rds/src/ruterror.h b/alliance/src/rds/src/ruterror.h index 95811e1d..0ad906f7 100644 --- a/alliance/src/rds/src/ruterror.h +++ b/alliance/src/rds/src/ruterror.h @@ -46,7 +46,9 @@ | | \------------------------------------------------------------*/ -# define ruterror( E, V ) (rut_error( (E), (V), __FILE__, __LINE__ )) +extern char *basename(); + +# define ruterror( E, V ) (rut_error( (E), (V), basename(__FILE__), __LINE__ )) /*------------------------------------------------------------\ | | diff --git a/alliance/src/rds/src/rwierror.h b/alliance/src/rds/src/rwierror.h index 758018e4..4f7b9e68 100644 --- a/alliance/src/rds/src/rwierror.h +++ b/alliance/src/rds/src/rwierror.h @@ -41,7 +41,7 @@ | | \------------------------------------------------------------*/ -# define rwierror( E, V ) (rwi_error( (E), (V), __FILE__, __LINE__ )) +# define rwierror( E, V ) (rwi_error( (E), (V), basename(__FILE__), __LINE__ )) /*------------------------------------------------------------\ | |