From a31b5ec9de0ffe09ff591ebb2eee76389e36d076 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Thu, 17 Feb 2005 15:34:44 +0000 Subject: [PATCH] * Bug correction (compliance with gcc 3.4.x). --- alliance/src/boog/src/bog_lib_complete.c | 2 +- alliance/src/genlib/src/dpgen_Regular.c | 5 +- alliance/src/genlib/src/dpgen_uROM.c | 3 +- alliance/src/l2p/src/drive_ps.c | 58 ++++++++++++------------ alliance/src/nero/src/MDRGrid.cpp | 4 +- alliance/src/sea/src/util_Defs.h | 22 ++++----- alliance/src/sea/src/util_MBK.c | 12 ++--- 7 files changed, 55 insertions(+), 51 deletions(-) diff --git a/alliance/src/boog/src/bog_lib_complete.c b/alliance/src/boog/src/bog_lib_complete.c index 48e67829..3ee71ec4 100644 --- a/alliance/src/boog/src/bog_lib_complete.c +++ b/alliance/src/boog/src/bog_lib_complete.c @@ -168,7 +168,7 @@ static int addgeneric(chain_list *abl, befig_list* befig, int area, float R, flo if ( !abl ) { - fprintf(stderr,__FUNCTION__ ": NULL pointer\n"); + fprintf(stderr,"addgeneric() : NULL pointer\n"); exit(1); } diff --git a/alliance/src/genlib/src/dpgen_Regular.c b/alliance/src/genlib/src/dpgen_Regular.c index 69c1ef8e..6d5bf5c1 100644 --- a/alliance/src/genlib/src/dpgen_Regular.c +++ b/alliance/src/genlib/src/dpgen_Regular.c @@ -1,5 +1,5 @@ /* - * $Id: dpgen_Regular.c,v 1.2 2002/09/30 16:20:22 czo Exp $ + * $Id: dpgen_Regular.c,v 1.3 2005/02/17 15:34:44 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -257,6 +257,7 @@ static long set_iLeafCell () case DPGEN_BUFF: LV_iLeafCell += CELLS_INV; case DPGEN_INV: default: + break; } return (LV_iLeafCell); @@ -1057,6 +1058,7 @@ static void VHDL_entity () fprintf (LV_FILE, "%14s : in BIT_VECTOR %s;\n", "i0", sBusWide); break; case DPGEN_CONST: + break; } @@ -1506,6 +1508,7 @@ extern void dpgen_Regular (aFunction, aAL) case DPGEN_DFFT: case DPGEN_SFF: case DPGEN_SFFT: + break; } diff --git a/alliance/src/genlib/src/dpgen_uROM.c b/alliance/src/genlib/src/dpgen_uROM.c index 9ad788c2..781d4344 100644 --- a/alliance/src/genlib/src/dpgen_uROM.c +++ b/alliance/src/genlib/src/dpgen_uROM.c @@ -1,5 +1,5 @@ /* - * $Id: dpgen_uROM.c,v 1.2 2002/09/30 16:20:22 czo Exp $ + * $Id: dpgen_uROM.c,v 1.3 2005/02/17 15:34:44 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -113,6 +113,7 @@ static long set_iLeafCell () case DPGEN_ROM4: LV_iLeafCell += CELLS_ROM2; case DPGEN_ROM2: default: + break; } return (LV_iLeafCell); diff --git a/alliance/src/l2p/src/drive_ps.c b/alliance/src/l2p/src/drive_ps.c index bb9c9527..d6e062bf 100644 --- a/alliance/src/l2p/src/drive_ps.c +++ b/alliance/src/l2p/src/drive_ps.c @@ -46,7 +46,7 @@ /* printer. */ /****************************************************************************/ -#ident "$Id: drive_ps.c,v 1.4 2002/09/30 16:20:42 czo Exp $" +#ident "$Id: drive_ps.c,v 1.5 2005/02/17 15:34:44 jpc Exp $" #define DRIVE2PS @@ -509,6 +509,34 @@ int l; }; }; +/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ +void stonrec (ax,ay,aw,ah,ar,ap) +double ax,ay,aw,ah; +rdsrec_list *ar; +rps_pge *ap; +{ + list_rnm *recpno; + + if (!p.norectname && ar->NAME!=NULL && !IsRdsConInter(ar)) { + if ((IsRdsConExter(ar) && p.noconame) || + (IsRdsReference(ar) && p.norefname) || + (IsRdsInstance(ar) && p.noinstname) || + (IsRdsSegment(ar) && p.nosegname) ) { + } + else { + recpno=(list_rnm *) mbkalloc (sizeof(list_rnm)); + recpno->x=(int)(ax+(aw/2.0)); + recpno->y=(int)(ay+(ah/2.0)); + recpno->rot=RDS_NO; + if ((ah > aw) && IsRdsInstance(ar)) recpno->rot=RDS_YES; + recpno->lirec=ar; + recpno->next=ap->prpnom; + ap->prpnom=recpno; + }; + }; + return; +}; + /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ void rps_filter_rec (r) rdsrec_list *r; @@ -570,34 +598,6 @@ rdsrec_list *r; }; }; -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -void stonrec (ax,ay,aw,ah,ar,ap) -double ax,ay,aw,ah; -rdsrec_list *ar; -rps_pge *ap; -{ - list_rnm *recpno; - - if (!p.norectname && ar->NAME!=NULL && !IsRdsConInter(ar)) { - if ((IsRdsConExter(ar) && p.noconame) || - (IsRdsReference(ar) && p.norefname) || - (IsRdsInstance(ar) && p.noinstname) || - (IsRdsSegment(ar) && p.nosegname) ) { - } - else { - recpno=(list_rnm *) mbkalloc (sizeof(list_rnm)); - recpno->x=(int)(ax+(aw/2.0)); - recpno->y=(int)(ay+(ah/2.0)); - recpno->rot=RDS_NO; - if ((ah > aw) && IsRdsInstance(ar)) recpno->rot=RDS_YES; - recpno->lirec=ar; - recpno->next=ap->prpnom; - ap->prpnom=recpno; - }; - }; - return; -}; - /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ void addname() { diff --git a/alliance/src/nero/src/MDRGrid.cpp b/alliance/src/nero/src/MDRGrid.cpp index 7410383a..5abaa7bb 100644 --- a/alliance/src/nero/src/MDRGrid.cpp +++ b/alliance/src/nero/src/MDRGrid.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- // -// $Id: MDRGrid.cpp,v 1.4 2004/07/23 08:50:04 jpc Exp $ +// $Id: MDRGrid.cpp,v 1.5 2005/02/17 15:34:44 jpc Exp $ // // /----------------------------------------------------------------\ // | | @@ -496,7 +496,7 @@ template TMatrix<__CNode__>::TMatrix (CDRGrid *drgrid) { _drgrid = drgrid; - _grid = new (__CNode__) [_drgrid->size]; + _grid = new __CNode__ [_drgrid->size]; } diff --git a/alliance/src/sea/src/util_Defs.h b/alliance/src/sea/src/util_Defs.h index 0adc244a..4d27a2c6 100644 --- a/alliance/src/sea/src/util_Defs.h +++ b/alliance/src/sea/src/util_Defs.h @@ -1,5 +1,5 @@ /* - * $Id: util_Defs.h,v 1.4 2002/09/30 16:21:18 czo Exp $ + * $Id: util_Defs.h,v 1.5 2005/02/17 15:34:44 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -370,22 +370,22 @@ } ePow_t; - extern struct ePow_s *addPow __FP((struct ePow_s **applPow, - long aY, - long aW, - char *aName, - char aType, - char aDir)); + extern ePow_t *addPow __FP((ePow_t **applPow, + long aY, + long aW, + char *aName, + char aType, + char aDir)); extern void freePow __FP((struct ePow_s *aplPow)); extern struct ePow_s *getPow __FP((struct ePow_s *aplPow, long aY)); extern void mergeXPow __FP((struct ePow_s *apPow, long axMin, long axMax, long aW)); - extern struct ePow_s *buildPow __FP((struct phfig *apPhfig, - char aLayer, - char aDir, - char *asSuffix)); + extern ePow_t *buildPow __FP((phfig_list *apPhfig, + char aLayer, + char aDir, + char *asSuffix)); extern void powToCon __FP(( struct phfig *apPhfig, char aLayer, char aDir, diff --git a/alliance/src/sea/src/util_MBK.c b/alliance/src/sea/src/util_MBK.c index 92048c0f..9fc97b17 100644 --- a/alliance/src/sea/src/util_MBK.c +++ b/alliance/src/sea/src/util_MBK.c @@ -1,6 +1,6 @@ /* - * $Id: util_MBK.c,v 1.4 2003/10/28 14:42:05 xtof Exp $ + * $Id: util_MBK.c,v 1.5 2005/02/17 15:34:44 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -1087,11 +1087,11 @@ extern long cmpSigName(apLoSig, asName) * Function : "addInsLoCon()". */ -extern locon_list *addInsLoCon(apIns, asName, apSig, aDir) - loins_list *apIns; - char *asName; - losig_list *apSig; - char aDir; +extern struct locon *addInsLoCon(apIns, asName, apSig, aDir) + struct loins *apIns; + char *asName; + struct losig *apSig; + char aDir; { locon_list *pCon; char *sName;