Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 4793) +++ trunk/src/netlist.c (revision 4794) @@ -255,7 +255,7 @@ /* --------------------------------------------------------------------------- * get next slot for a subnet, allocates memory if necessary */ -pcb_net_t *GetNetMemory(NetListTypePtr Netlist) +pcb_net_t *GetNetMemory(pcb_netlist_t *Netlist) { pcb_net_t *net = Netlist->Net; @@ -272,16 +272,16 @@ /* --------------------------------------------------------------------------- * get next slot for a net list, allocates memory if necessary */ -NetListTypePtr GetNetListMemory(NetListListTypePtr Netlistlist) +pcb_netlist_t *GetNetListMemory(pcb_netlist_list_t *Netlistlist) { - NetListTypePtr netlist = Netlistlist->NetList; + pcb_netlist_t *netlist = Netlistlist->NetList; /* realloc new memory if necessary and clear it */ if (Netlistlist->NetListN >= Netlistlist->NetListMax) { Netlistlist->NetListMax += STEP_POINT; - netlist = (NetListTypePtr) realloc(netlist, Netlistlist->NetListMax * sizeof(NetListType)); + netlist = (pcb_netlist_t *) realloc(netlist, Netlistlist->NetListMax * sizeof(pcb_netlist_t)); Netlistlist->NetList = netlist; - memset(netlist + Netlistlist->NetListN, 0, STEP_POINT * sizeof(NetListType)); + memset(netlist + Netlistlist->NetListN, 0, STEP_POINT * sizeof(pcb_netlist_t)); } return (netlist + Netlistlist->NetListN++); } @@ -289,7 +289,7 @@ /* --------------------------------------------------------------------------- * frees memory used by a net */ -void FreeNetListMemory(NetListTypePtr Netlist) +void FreeNetListMemory(pcb_netlist_t *Netlist) { if (Netlist) { NET_LOOP(Netlist); @@ -298,7 +298,7 @@ } END_LOOP; free(Netlist->Net); - memset(Netlist, 0, sizeof(NetListType)); + memset(Netlist, 0, sizeof(pcb_netlist_t)); } } @@ -305,7 +305,7 @@ /* --------------------------------------------------------------------------- * frees memory used by a net list */ -void FreeNetListListMemory(NetListListTypePtr Netlistlist) +void FreeNetListListMemory(pcb_netlist_list_t *Netlistlist) { if (Netlistlist) { NETLIST_LOOP(Netlistlist); @@ -314,7 +314,7 @@ } END_LOOP; free(Netlistlist->NetList); - memset(Netlistlist, 0, sizeof(NetListListType)); + memset(Netlistlist, 0, sizeof(pcb_netlist_list_t)); } } Index: trunk/src/netlist.h =================================================================== --- trunk/src/netlist.h (revision 4793) +++ trunk/src/netlist.h (revision 4794) @@ -43,13 +43,13 @@ pcb_cardinal_t NetN, /* the number of subnets contained */ NetMax; /* max subnets from malloc */ pcb_net_t *Net; -} NetListType, *NetListTypePtr; +} pcb_netlist_t; typedef struct { /* holds a list of net lists */ pcb_cardinal_t NetListN, /* the number of net lists contained */ NetListMax; /* max net lists from malloc */ - NetListTypePtr NetList; -} NetListListType, *NetListListTypePtr; + pcb_netlist_t *NetList; +} pcb_netlist_list_t; void pcb_netlist_changed(int force_unfreeze); @@ -87,15 +87,15 @@ #define PCB_NETLIST_INVALID_INDEX ((pcb_cardinal_t)(-1)) -pcb_net_t *GetNetMemory(NetListTypePtr); -NetListTypePtr GetNetListMemory(NetListListTypePtr); -void FreeNetListListMemory(NetListListTypePtr); -void FreeNetListMemory(NetListTypePtr); +pcb_net_t *GetNetMemory(pcb_netlist_t *); +pcb_netlist_t *GetNetListMemory(pcb_netlist_list_t *); +void FreeNetListListMemory(pcb_netlist_list_t *); +void FreeNetListMemory(pcb_netlist_t *); void FreeNetMemory(pcb_net_t *); #define NETLIST_LOOP(top) do { \ pcb_cardinal_t n; \ - NetListTypePtr netlist; \ + pcb_netlist_t * netlist; \ for (n = (top)->NetListN-1; n != -1; n--) \ { \ netlist = &(top)->NetList[n] Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4793) +++ trunk/src/rats.c (revision 4794) @@ -61,11 +61,11 @@ */ static pcb_bool FindPad(const char *, const char *, pcb_connection_t *, pcb_bool); static pcb_bool ParseConnection(const char *, char *, char *); -static pcb_bool DrawShortestRats(NetListTypePtr, +static pcb_bool DrawShortestRats(pcb_netlist_t *, void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)); -static pcb_bool GatherSubnets(NetListTypePtr, pcb_bool, pcb_bool); +static pcb_bool GatherSubnets(pcb_netlist_t *, pcb_bool, pcb_bool); static pcb_bool CheckShorts(pcb_lib_menu_t *); -static void TransferNet(NetListTypePtr, pcb_net_t *, pcb_net_t *); +static void TransferNet(pcb_netlist_t *, pcb_net_t *, pcb_net_t *); /* --------------------------------------------------------------------------- * some local identifiers @@ -184,12 +184,12 @@ * Read the library-netlist build a pcb_true Netlist structure */ -NetListTypePtr ProcNetlist(pcb_lib_t *net_menu) +pcb_netlist_t *ProcNetlist(pcb_lib_t *net_menu) { pcb_connection_t *connection; pcb_connection_t LastPoint; pcb_net_t *net; - static NetListTypePtr Wantlist = NULL; + static pcb_netlist_t *Wantlist = NULL; if (!net_menu->MenuN) return (NULL); @@ -201,7 +201,7 @@ SLayer = GetLayerGroupNumberByNumber(solder_silk_layer); CLayer = GetLayerGroupNumberByNumber(component_silk_layer); - Wantlist = (NetListTypePtr) calloc(1, sizeof(NetListType)); + Wantlist = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t)); if (Wantlist) { ALLPIN_LOOP(PCB->Data); { @@ -289,7 +289,7 @@ * copy all connections from one net into another * and then remove the first net from its netlist */ -static void TransferNet(NetListTypePtr Netl, pcb_net_t *SourceNet, pcb_net_t *DestNet) +static void TransferNet(pcb_netlist_t *Netl, pcb_net_t *SourceNet, pcb_net_t *DestNet) { pcb_connection_t *conn; @@ -393,7 +393,7 @@ * initially the netlist has each connection in its own individual net * afterwards there can be many fewer nets with multiple connections each */ -static pcb_bool GatherSubnets(NetListTypePtr Netl, pcb_bool NoWarn, pcb_bool AndRats) +static pcb_bool GatherSubnets(pcb_netlist_t *Netl, pcb_bool NoWarn, pcb_bool AndRats) { pcb_net_t *a, *b; pcb_connection_t *conn; @@ -491,7 +491,7 @@ */ static pcb_bool -DrawShortestRats(NetListTypePtr Netl, +DrawShortestRats(pcb_netlist_t *Netl, void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)) { pcb_rat_t *line; @@ -647,7 +647,7 @@ AddAllRats(pcb_bool SelectedOnly, void (*funcp) (register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)) { - NetListTypePtr Nets, Wantlist; + pcb_netlist_t *Nets, *Wantlist; pcb_net_t *lonesome; pcb_connection_t *onepin; pcb_bool changed, Warned = pcb_false; @@ -666,7 +666,7 @@ /* initialize finding engine */ InitConnectionLookup(); SaveFindFlag(PCB_FLAG_DRC); - Nets = (NetListTypePtr) calloc(1, sizeof(NetListType)); + Nets = (pcb_netlist_t *) calloc(1, sizeof(pcb_netlist_t)); /* now we build another netlist (Nets) for each * net in Wantlist that shows how it actually looks now, * then fill in any missing connections with rat lines. @@ -731,10 +731,10 @@ /* XXX: This is copied in large part from AddAllRats above; for * maintainability, AddAllRats probably wants to be tweaked to use this * version of the code so that we don't have duplication. */ -NetListListType CollectSubnets(pcb_bool SelectedOnly) +pcb_netlist_list_t CollectSubnets(pcb_bool SelectedOnly) { - NetListListType result = { 0, 0, NULL }; - NetListTypePtr Nets, Wantlist; + pcb_netlist_list_t result = { 0, 0, NULL }; + pcb_netlist_t *Nets, *Wantlist; pcb_net_t *lonesome; pcb_connection_t *onepin; Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 4793) +++ trunk/src/rats.h (revision 4794) @@ -53,8 +53,8 @@ pcb_bool AddAllRats(pcb_bool, void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)); pcb_bool SeekPad(pcb_lib_entry_t *, pcb_connection_t *, pcb_bool); -NetListTypePtr ProcNetlist(pcb_lib_t *); -NetListListType CollectSubnets(pcb_bool); +pcb_netlist_t *ProcNetlist(pcb_lib_t *); +pcb_netlist_list_t CollectSubnets(pcb_bool); pcb_connection_t *GetConnectionMemory(pcb_net_t *); #define CONNECTION_LOOP(net) do { \ Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4793) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4794) @@ -72,7 +72,7 @@ /* --------------------------------------------------------------------------- * some local prototypes */ -static double ComputeCost(NetListTypePtr Nets, double T0, double T); +static double ComputeCost(pcb_netlist_t *Nets, double T0, double T); /* --------------------------------------------------------------------------- * some local types @@ -140,7 +140,7 @@ * Update the X, Y and group position information stored in the NetList after * elements have possibly been moved, rotated, flipped, etc. */ -static void UpdateXY(NetListTypePtr Nets) +static void UpdateXY(pcb_netlist_t *Nets) { pcb_cardinal_t SLayer, CLayer; pcb_cardinal_t i, j; @@ -292,7 +292,7 @@ * "Placement and Routing of Electronic Modules" edited by Michael Pecht * Marcel Dekker, Inc. 1993. ISBN: 0-8247-8916-4 TK7868.P7.P57 1993 */ -static double ComputeCost(NetListTypePtr Nets, double T0, double T) +static double ComputeCost(pcb_netlist_t *Nets, double T0, double T) { double W = 0; /* wire cost */ double delta1 = 0; /* wire congestion penalty function */ @@ -672,7 +672,7 @@ */ pcb_bool AutoPlaceSelected(void) { - NetListTypePtr Nets; + pcb_netlist_t *Nets; PointerListType Selected = { 0, 0, NULL }; PerturbationType pt; double C0, T0; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 4793) +++ trunk/src_plugins/autoroute/autoroute.c (revision 4794) @@ -851,7 +851,7 @@ static routedata_t *CreateRouteData() { - NetListListType Nets; + pcb_netlist_list_t Nets; PointerListType layergroupboxes[MAX_LAYER]; pcb_box_t bbox; routedata_t *rd; Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4793) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 4794) @@ -139,7 +139,7 @@ static int smartdisperse(int argc, const char **argv, Coord x, Coord y) { const char *function = ARG(0); - NetListType *Nets; + pcb_netlist_t *Nets; htpi_t visited; /* PointerListType stack = { 0, 0, NULL };*/ int all; Index: trunk/src_plugins/toporouter/toporouter.c =================================================================== --- trunk/src_plugins/toporouter/toporouter.c (revision 4793) +++ trunk/src_plugins/toporouter/toporouter.c (revision 4794) @@ -2697,7 +2697,7 @@ void import_clusters(toporouter_t * r) { - NetListListType nets; + pcb_netlist_list_t nets; ResetConnections(pcb_false); nets = CollectSubnets(pcb_false); NETLIST_LOOP(&nets); Index: trunk/src_plugins/toporouter/toporouter.h =================================================================== --- trunk/src_plugins/toporouter/toporouter.h (revision 4793) +++ trunk/src_plugins/toporouter/toporouter.h (revision 4794) @@ -161,7 +161,7 @@ struct _toporouter_edge_t { GtsEdge e; - /*NetListType *netlist; */ + /*pcb_netlist_t *netlist; */ guint flags;