From da73f50a9210e70675df66534413336f52ea1dce Mon Sep 17 00:00:00 2001 From: Ludovic Jacomme Date: Thu, 25 Apr 2002 14:15:25 +0000 Subject: [PATCH] __FILE__ + cast foireux --- alliance/src/fvh/src/fbl_bcomp_l.l | 3 ++- alliance/src/fvh/src/fbl_bcomp_y.y | 2 +- alliance/src/fvh/src/fbl_bspec.h | 2 +- alliance/src/fvh/src/fbl_drive.h | 2 +- alliance/src/fvh/src/fvherror.h | 6 ++++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/alliance/src/fvh/src/fbl_bcomp_l.l b/alliance/src/fvh/src/fbl_bcomp_l.l index d7bb6de9..c402f8ce 100644 --- a/alliance/src/fvh/src/fbl_bcomp_l.l +++ b/alliance/src/fvh/src/fbl_bcomp_l.l @@ -161,7 +161,8 @@ static int find_mc(s) el_mc *pt; loc = namealloc(s); - pt= (el_mc *) bsearch(loc, (char *)tab_mc,FBL_NB_MC,sizeof(el_mc),strcmp); + pt= (el_mc *) bsearch(loc, (char *)tab_mc,FBL_NB_MC,sizeof(el_mc), + (int (*)(const void *, const void *))strcmp); if (pt==NULL) return(-1); return(pt->kval); } diff --git a/alliance/src/fvh/src/fbl_bcomp_y.y b/alliance/src/fvh/src/fbl_bcomp_y.y index aba553c4..60fee6ae 100644 --- a/alliance/src/fvh/src/fbl_bcomp_y.y +++ b/alliance/src/fvh/src/fbl_bcomp_y.y @@ -2355,7 +2355,7 @@ choices2 fbl_error (30,NULL); } FBL_NM1LST = addchain (FBL_NM1LST ,$3.NAME); - fprintf( stdout, "%s%d: %s\n", __FILE__,__LINE__,$3.NAME ); + fprintf( stdout, "%s%d: %s\n", basename(__FILE__),__LINE__,$3.NAME ); } ; diff --git a/alliance/src/fvh/src/fbl_bspec.h b/alliance/src/fvh/src/fbl_bspec.h index 651f6a24..0eb24423 100644 --- a/alliance/src/fvh/src/fbl_bspec.h +++ b/alliance/src/fvh/src/fbl_bspec.h @@ -64,4 +64,4 @@ extern ablexpr *bddToAbl () ; extern void fbl_toolbug __P((int code, char *str1, char *str2, int nbr1)); # define fbl_error( C, S ) \ - fprintf( stderr, "%s.%d: ", __FILE__,__LINE__ ); loc_fbl_error( C, S ); + fprintf( stderr, "%s.%d: ", basename(__FILE__),__LINE__ ); loc_fbl_error( C, S ); diff --git a/alliance/src/fvh/src/fbl_drive.h b/alliance/src/fvh/src/fbl_drive.h index 423bfaf7..eff13d87 100644 --- a/alliance/src/fvh/src/fbl_drive.h +++ b/alliance/src/fvh/src/fbl_drive.h @@ -53,4 +53,4 @@ extern char *fbl_printabl(); extern char * fbl_vectorize __P((char *Name)); # define fbl_error( C, S ) \ - fprintf( stderr, "%s.%d: ", __FILE__,__LINE__ ); loc_fbl_error( C, S ) + fprintf( stderr, "%s.%d: ", basename(__FILE__),__LINE__ ); loc_fbl_error( C, S ) diff --git a/alliance/src/fvh/src/fvherror.h b/alliance/src/fvh/src/fvherror.h index 24d4b1f8..7a0a1cfb 100644 --- a/alliance/src/fvh/src/fvherror.h +++ b/alliance/src/fvh/src/fvherror.h @@ -97,8 +97,10 @@ | | \------------------------------------------------------------*/ -# define fvherror( E, T, V ) (fvh_error((int)(E),(char *)(T),(long)(V),__FILE__,__LINE__)) -# define fvhwarning( E, T, V ) (fvh_warning((int)(E),(char *)(T),(long)(V),__FILE__,__LINE__)) +# define fvherror( E, T, V ) \ + (fvh_error((int)(E),(char *)(T),(long)(V),basename(__FILE__),__LINE__)) +# define fvhwarning( E, T, V ) \ + (fvh_warning((int)(E),(char *)(T),(long)(V),basename(__FILE__),__LINE__)) /*------------------------------------------------------------\ | |