Index: trunk/src/board.h =================================================================== --- trunk/src/board.h (revision 4791) +++ trunk/src/board.h (revision 4792) @@ -97,7 +97,7 @@ pcb_font_t Font; pcb_layer_group_t LayerGroups; vtroutestyle_t RouteStyle; - LibraryType NetlistLib[NUM_NETLISTS]; + pcb_lib_t NetlistLib[NUM_NETLISTS]; pcb_ratspatch_line_t *NetlistPatches, *NetlistPatchLast; pcb_attribute_list_t Attributes; pcb_data_t *Data; /* entire database */ Index: trunk/src/library.c =================================================================== --- trunk/src/library.c (revision 4791) +++ trunk/src/library.c (revision 4792) @@ -40,16 +40,16 @@ /* --------------------------------------------------------------------------- * get next slot for a library menu, allocates memory if necessary */ -LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr lib, int *idx) +pcb_lib_menu_t *GetLibraryMenuMemory(pcb_lib_t *lib, int *idx) { - LibraryMenuTypePtr menu = lib->Menu; + pcb_lib_menu_t *menu = lib->Menu; /* realloc new memory if necessary and clear it */ if (lib->MenuN >= lib->MenuMax) { lib->MenuMax += STEP_LIBRARYMENU; - menu = (LibraryMenuTypePtr) realloc(menu, lib->MenuMax * sizeof(LibraryMenuType)); + menu = (pcb_lib_menu_t *) realloc(menu, lib->MenuMax * sizeof(pcb_lib_menu_t)); lib->Menu = menu; - memset(menu + lib->MenuN, 0, STEP_LIBRARYMENU * sizeof(LibraryMenuType)); + memset(menu + lib->MenuN, 0, STEP_LIBRARYMENU * sizeof(pcb_lib_menu_t)); } if (idx != NULL) *idx = lib->MenuN; @@ -56,9 +56,9 @@ return (menu + lib->MenuN++); } -void DeleteLibraryMenuMemory(LibraryTypePtr lib, int menuidx) +void DeleteLibraryMenuMemory(pcb_lib_t *lib, int menuidx) { - LibraryMenuTypePtr menu = lib->Menu; + pcb_lib_menu_t *menu = lib->Menu; if (menu[menuidx].Name != NULL) free(menu[menuidx].Name); @@ -66,22 +66,22 @@ free(menu[menuidx].directory); lib->MenuN--; - memmove(menu + menuidx, menu + menuidx + 1, sizeof(LibraryMenuType) * (lib->MenuN - menuidx)); + memmove(menu + menuidx, menu + menuidx + 1, sizeof(pcb_lib_menu_t) * (lib->MenuN - menuidx)); } /* --------------------------------------------------------------------------- * get next slot for a library entry, allocates memory if necessary */ -LibraryEntryTypePtr GetLibraryEntryMemory(LibraryMenuTypePtr Menu) +pcb_lib_entry_t *GetLibraryEntryMemory(pcb_lib_menu_t *Menu) { - LibraryEntryTypePtr entry = Menu->Entry; + pcb_lib_entry_t *entry = Menu->Entry; /* realloc new memory if necessary and clear it */ if (Menu->EntryN >= Menu->EntryMax) { Menu->EntryMax += STEP_LIBRARYENTRY; - entry = (LibraryEntryTypePtr) realloc(entry, Menu->EntryMax * sizeof(LibraryEntryType)); + entry = (pcb_lib_entry_t *) realloc(entry, Menu->EntryMax * sizeof(pcb_lib_entry_t)); Menu->Entry = entry; - memset(entry + Menu->EntryN, 0, STEP_LIBRARYENTRY * sizeof(LibraryEntryType)); + memset(entry + Menu->EntryN, 0, STEP_LIBRARYENTRY * sizeof(pcb_lib_entry_t)); } return (entry + Menu->EntryN++); } @@ -90,7 +90,7 @@ /* --------------------------------------------------------------------------- * releases the memory that's allocated by the library */ -void FreeLibraryMemory(LibraryTypePtr lib) +void FreeLibraryMemory(pcb_lib_t *lib) { MENU_LOOP(lib); { @@ -108,15 +108,15 @@ free(lib->Menu); /* clear struct */ - memset(lib, 0, sizeof(LibraryType)); + memset(lib, 0, sizeof(pcb_lib_t)); } /* --------------------------------------------------------------------------- * Add a new net to the netlist menu */ -LibraryMenuTypePtr CreateNewNet(LibraryTypePtr lib, char *name, const char *style) +pcb_lib_menu_t *CreateNewNet(pcb_lib_t *lib, char *name, const char *style) { - LibraryMenuTypePtr menu; + pcb_lib_menu_t *menu; char temp[64]; sprintf(temp, " %s", name); @@ -133,9 +133,9 @@ /* --------------------------------------------------------------------------- * Add a connection to the net */ -LibraryEntryTypePtr CreateNewConnection(LibraryMenuTypePtr net, char *conn) +pcb_lib_entry_t *CreateNewConnection(pcb_lib_menu_t *net, char *conn) { - LibraryEntryTypePtr entry = GetLibraryEntryMemory(net); + pcb_lib_entry_t *entry = GetLibraryEntryMemory(net); entry->ListEntry = pcb_strdup_null(conn); entry->ListEntry_dontfree = 0; Index: trunk/src/library.h =================================================================== --- trunk/src/library.h (revision 4791) +++ trunk/src/library.h (revision 4792) @@ -30,13 +30,13 @@ #include "global_typedefs.h" -typedef struct LibraryEntryTpye_s LibraryEntryType, *LibraryEntryTypePtr; -typedef struct LibraryMenuType_s LibraryMenuType, *LibraryMenuTypePtr; +typedef struct pcb_lib_entry_s pcb_lib_entry_t; +typedef struct pcb_lib_menu_s pcb_lib_menu_t; /* --------------------------------------------------------------------------- * structure used by library routines */ -struct LibraryEntryTpye_s { +struct pcb_lib_entry_s { const char *ListEntry; /* the string for the selection box */ int ListEntry_dontfree; /* do not free(ListEntry) if non-zero */ /* This used to contain some char *AllocatedMemory, possibly with @@ -58,13 +58,13 @@ CreateLibraryEntry. These "internal" entries are used for electrical paths that aren't yet assigned to a real net. */ -struct LibraryMenuType_s { +struct pcb_lib_menu_s { char *Name, /* name of the menu entry */ *directory, /* Directory name library elements are from */ *Style; /* routing style */ pcb_cardinal_t EntryN, /* number of objects */ EntryMax; /* number of reserved memory locations */ - LibraryEntryTypePtr Entry; /* the entries */ + pcb_lib_entry_t *Entry; /* the entries */ char flag; /* used by the netlist window to enable/disable nets */ char internal; /* if set, this is an internal-only entry, not part of the global netlist. */ @@ -73,21 +73,21 @@ typedef struct { pcb_cardinal_t MenuN; /* number of objects */ pcb_cardinal_t MenuMax; /* number of reserved memory locations */ - LibraryMenuTypePtr Menu; /* the entries */ -} LibraryType, *LibraryTypePtr; + pcb_lib_menu_t *Menu; /* the entries */ +} pcb_lib_t; -LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr, int *idx); -LibraryEntryTypePtr GetLibraryEntryMemory(LibraryMenuTypePtr); -void FreeLibraryMemory(LibraryTypePtr); -void DeleteLibraryMenuMemory(LibraryTypePtr lib, int menuidx); +pcb_lib_menu_t *GetLibraryMenuMemory(pcb_lib_t *, int *idx); +pcb_lib_entry_t *GetLibraryEntryMemory(pcb_lib_menu_t *); +void FreeLibraryMemory(pcb_lib_t *); +void DeleteLibraryMenuMemory(pcb_lib_t *lib, int menuidx); -LibraryMenuTypePtr CreateNewNet(LibraryTypePtr lib, char *name, const char *style); -LibraryEntryTypePtr CreateNewConnection(LibraryMenuTypePtr net, char *conn); +pcb_lib_menu_t *CreateNewNet(pcb_lib_t *lib, char *name, const char *style); +pcb_lib_entry_t *CreateNewConnection(pcb_lib_menu_t *net, char *conn); #define MENU_LOOP(top) do { \ pcb_cardinal_t l; \ - LibraryMenuTypePtr menu; \ + pcb_lib_menu_t *menu; \ for (l = (top)->MenuN-1; l != -1; l--) \ { \ menu = &(top)->Menu[l] @@ -94,7 +94,7 @@ #define ENTRY_LOOP(top) do { \ pcb_cardinal_t n; \ - LibraryEntryTypePtr entry; \ + pcb_lib_entry_t *entry; \ for (n = (top)->EntryN-1; n != -1; n--) \ { \ entry = &(top)->Entry[n] Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 4791) +++ trunk/src/netlist.c (revision 4792) @@ -66,7 +66,7 @@ } } -LibraryMenuTypePtr pcb_netnode_to_netname(const char *nodename) +pcb_lib_menu_t *pcb_netnode_to_netname(const char *nodename) { int i, j; /*printf("nodename [%s]\n", nodename); */ @@ -81,7 +81,7 @@ return 0; } -LibraryMenuTypePtr pcb_netname_to_netname(const char *netname) +pcb_lib_menu_t *pcb_netname_to_netname(const char *netname) { int i; @@ -97,7 +97,7 @@ return 0; } -int pcb_pin_name_to_xy(LibraryEntryType * pin, Coord *x, Coord *y) +int pcb_pin_name_to_xy(pcb_lib_entry_t * pin, Coord *x, Coord *y) { pcb_connection_t conn; if (!SeekPad(pin, &conn, pcb_false)) @@ -115,7 +115,7 @@ return 1; } -void pcb_netlist_find(LibraryMenuType * net, LibraryEntryType * pin) +void pcb_netlist_find(pcb_lib_menu_t * net, pcb_lib_entry_t * pin) { Coord x, y; if (pcb_pin_name_to_xy(net->Entry, &x, &y)) @@ -123,7 +123,7 @@ LookupConnection(x, y, 1, 1, PCB_FLAG_FOUND); } -void pcb_netlist_select(LibraryMenuType * net, LibraryEntryType * pin) +void pcb_netlist_select(pcb_lib_menu_t * net, pcb_lib_entry_t * pin) { Coord x, y; if (pcb_pin_name_to_xy(net->Entry, &x, &y)) @@ -131,7 +131,7 @@ LookupConnection(x, y, 1, 1, PCB_FLAG_SELECTED); } -void pcb_netlist_rats(LibraryMenuType * net, LibraryEntryType * pin) +void pcb_netlist_rats(pcb_lib_menu_t * net, pcb_lib_entry_t * pin) { net->Name[0] = ' '; net->flag = 1; @@ -138,7 +138,7 @@ pcb_netlist_changed(0); } -void pcb_netlist_norats(LibraryMenuType * net, LibraryEntryType * pin) +void pcb_netlist_norats(pcb_lib_menu_t * net, pcb_lib_entry_t * pin) { net->Name[0] = '*'; net->flag = 0; @@ -148,9 +148,9 @@ /* The primary purpose of this action is to remove the netlist completely so that a new one can be loaded, usually via a gsch2pcb style script. */ -void pcb_netlist_clear(LibraryMenuType * net, LibraryEntryType * pin) +void pcb_netlist_clear(pcb_lib_menu_t * net, pcb_lib_entry_t * pin) { - LibraryType *netlist = (LibraryType *) & PCB->NetlistLib; + pcb_lib_t *netlist = (pcb_lib_t *) & PCB->NetlistLib; int ni, pi; if (net == 0) { @@ -183,21 +183,21 @@ pcb_netlist_changed(0); } -void pcb_netlist_style(LibraryMenuType * net, const char *style) +void pcb_netlist_style(pcb_lib_menu_t * net, const char *style) { free(net->Style); net->Style = pcb_strdup_null((char *) style); } -LibraryMenuTypePtr pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pin) +pcb_lib_menu_t *pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pin) { int n; for (n = 0; n < pcb->NetlistLib[NETLIST_EDITED].MenuN; n++) { - LibraryMenuTypePtr menu = &pcb->NetlistLib[NETLIST_EDITED].Menu[n]; + pcb_lib_menu_t *menu = &pcb->NetlistLib[NETLIST_EDITED].Menu[n]; int p; for (p = 0; p < menu->EntryN; p++) { - LibraryEntryTypePtr entry = &menu->Entry[p]; + pcb_lib_entry_t *entry = &menu->Entry[p]; if (strcmp(entry->ListEntry, pin) == 0) return menu; } @@ -205,7 +205,7 @@ return NULL; } -static LibraryMenuTypePtr pcb_netlist_find_net4pin_any(pcb_board_t *pcb, const char *ename, const char *pname) +static pcb_lib_menu_t *pcb_netlist_find_net4pin_any(pcb_board_t *pcb, const char *ename, const char *pname) { char pinname[256]; int len; @@ -220,7 +220,7 @@ return pcb_netlist_find_net4pinname(pcb, pinname); } -LibraryMenuTypePtr pcb_netlist_find_net4pin(pcb_board_t *pcb, const pcb_pin_t *pin) +pcb_lib_menu_t *pcb_netlist_find_net4pin(pcb_board_t *pcb, const pcb_pin_t *pin) { const pcb_element_t *e = pin->Element; @@ -231,7 +231,7 @@ } -LibraryMenuTypePtr pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad) +pcb_lib_menu_t *pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad) { const pcb_element_t *e = pad->Element; @@ -241,10 +241,10 @@ return pcb_netlist_find_net4pin_any(pcb, e->Name[NAMEONPCB_INDEX].TextString, pad->Number); } -pcb_cardinal_t pcb_netlist_net_idx(pcb_board_t *pcb, LibraryMenuType *net) +pcb_cardinal_t pcb_netlist_net_idx(pcb_board_t *pcb, pcb_lib_menu_t *net) { - LibraryMenuType *first = &pcb->NetlistLib[NETLIST_EDITED].Menu[0]; - LibraryMenuType *last = &pcb->NetlistLib[NETLIST_EDITED].Menu[pcb->NetlistLib[NETLIST_EDITED].MenuN-1]; + pcb_lib_menu_t *first = &pcb->NetlistLib[NETLIST_EDITED].Menu[0]; + pcb_lib_menu_t *last = &pcb->NetlistLib[NETLIST_EDITED].Menu[pcb->NetlistLib[NETLIST_EDITED].MenuN-1]; if ((net < first) || (net > last)) return PCB_NETLIST_INVALID_INDEX; Index: trunk/src/netlist.h =================================================================== --- trunk/src/netlist.h (revision 4791) +++ trunk/src/netlist.h (revision 4792) @@ -53,30 +53,30 @@ void pcb_netlist_changed(int force_unfreeze); -LibraryMenuTypePtr pcb_netnode_to_netname(const char *nodename); -LibraryMenuTypePtr pcb_netname_to_netname(const char *netname); +pcb_lib_menu_t *pcb_netnode_to_netname(const char *nodename); +pcb_lib_menu_t *pcb_netname_to_netname(const char *netname); -int pcb_pin_name_to_xy(LibraryEntryType *pin, Coord *x, Coord *y); -void pcb_netlist_find(LibraryMenuType *net, LibraryEntryType *pin); -void pcb_netlist_select(LibraryMenuType *net, LibraryEntryType *pin); -void pcb_netlist_rats(LibraryMenuType *net, LibraryEntryType *pin); -void pcb_netlist_norats(LibraryMenuType *net, LibraryEntryType *pin); -void pcb_netlist_clear(LibraryMenuType *net, LibraryEntryType *pin); -void pcb_netlist_style(LibraryMenuType *net, const char *style); +int pcb_pin_name_to_xy(pcb_lib_entry_t *pin, Coord *x, Coord *y); +void pcb_netlist_find(pcb_lib_menu_t *net, pcb_lib_entry_t *pin); +void pcb_netlist_select(pcb_lib_menu_t *net, pcb_lib_entry_t *pin); +void pcb_netlist_rats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin); +void pcb_netlist_norats(pcb_lib_menu_t *net, pcb_lib_entry_t *pin); +void pcb_netlist_clear(pcb_lib_menu_t *net, pcb_lib_entry_t *pin); +void pcb_netlist_style(pcb_lib_menu_t *net, const char *style); /* Return the net entry for a pin name (slow search). The pin name is like "U101-5", so element's refdes, dash, pin number */ -LibraryMenuTypePtr pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pinname); +pcb_lib_menu_t *pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pinname); /* Same as pcb_netlist_find_net4pinname but with pin pointer */ -LibraryMenuTypePtr pcb_netlist_find_net4pin(pcb_board_t *pcb, const pcb_pin_t *pin); -LibraryMenuTypePtr pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad); +pcb_lib_menu_t *pcb_netlist_find_net4pin(pcb_board_t *pcb, const pcb_pin_t *pin); +pcb_lib_menu_t *pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad); -/* Evaluate to const char * name of the network; lmt is (LibraryMenuType *) */ +/* Evaluate to const char * name of the network; lmt is (pcb_lib_menu_t *) */ #define pcb_netlist_name(lmt) ((const char *)((lmt)->Name+2)) -/* Evaluate to 0 or 1 depending on whether the net is marked with *; lmt is (LibraryMenuType *) */ +/* Evaluate to 0 or 1 depending on whether the net is marked with *; lmt is (pcb_lib_menu_t *) */ #define pcb_netlist_is_bad(lmt) (((lmt)->Name[0]) == '*') @@ -83,7 +83,7 @@ /* Return the index of the net or PCB_NETLIST_INVALID_INDEX if the net is not on the netlist. NOTE: indices returned are valid only until the first netlist change! */ -pcb_cardinal_t pcb_netlist_net_idx(pcb_board_t *pcb, LibraryMenuType *net); +pcb_cardinal_t pcb_netlist_net_idx(pcb_board_t *pcb, pcb_lib_menu_t *net); #define PCB_NETLIST_INVALID_INDEX ((pcb_cardinal_t)(-1)) Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 4791) +++ trunk/src/netlist_act.c (revision 4792) @@ -48,7 +48,7 @@ char *pins[3] = { NULL, NULL, NULL }; int next = 0, n; int ret = -1; - LibraryMenuTypePtr nets[2]; + pcb_lib_menu_t *nets[2]; ELEMENT_LOOP(PCB->Data); { @@ -113,9 +113,9 @@ static int pcb_netlist_add(const char *netname, const char *pinname) { int ni, pi; - LibraryType *netlist = &PCB->NetlistLib[NETLIST_EDITED]; - LibraryMenuType *net = NULL; - LibraryEntryType *pin = NULL; + pcb_lib_t *netlist = &PCB->NetlistLib[NETLIST_EDITED]; + pcb_lib_menu_t *net = NULL; + pcb_lib_entry_t *pin = NULL; for (ni = 0; ni < netlist->MenuN; ni++) if (strcmp(netlist->Menu[ni].Name + 2, netname) == 0) { @@ -200,14 +200,14 @@ %end-doc */ -typedef void (*NFunc) (LibraryMenuType *, LibraryEntryType *); +typedef void (*NFunc) (pcb_lib_menu_t *, pcb_lib_entry_t *); static int ActionNetlist(int argc, const char **argv, Coord x, Coord y) { NFunc func; int i, j; - LibraryMenuType *net; - LibraryEntryType *pin; + pcb_lib_menu_t *net; + pcb_lib_entry_t *pin; int net_found = 0; int pin_found = 0; int use_re = 0; Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 4791) +++ trunk/src/obj_common.h (revision 4792) @@ -80,7 +80,7 @@ pcb_flag_t Flags; \ pcb_attribute_list_t Attributes - /* struct LibraryEntryType *net */ + /* struct pcb_lib_entry_t *net */ /* Lines, pads, and rats all use this so they can be cross-cast. */ #define ANYLINEFIELDS \ Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4791) +++ trunk/src/plug_io.c (revision 4792) @@ -439,8 +439,8 @@ static int netlist_sort(const void *va, const void *vb) { - const LibraryMenuType *am = (const LibraryMenuType *) va; - const LibraryMenuType *bm = (const LibraryMenuType *) vb; + const pcb_lib_menu_t *am = (const pcb_lib_menu_t *) va; + const pcb_lib_menu_t *bm = (const pcb_lib_menu_t *) vb; const char *a = am->Name; const char *b = bm->Name; if (*a == '~') @@ -452,14 +452,14 @@ static int netnode_sort(const void *va, const void *vb) { - const LibraryEntryType *am = (const LibraryEntryType *) va; - const LibraryEntryType *bm = (const LibraryEntryType *) vb; + const pcb_lib_entry_t *am = (const pcb_lib_entry_t *) va; + const pcb_lib_entry_t *bm = (const pcb_lib_entry_t *) vb; const char *a = am->ListEntry; const char *b = bm->ListEntry; return string_cmp(a, b); } -void sort_library(LibraryTypePtr lib) +void sort_library(pcb_lib_t *lib) { int i; qsort(lib->Menu, lib->MenuN, sizeof(lib->Menu[0]), netlist_sort); Index: trunk/src/plug_io.h =================================================================== --- trunk/src/plug_io.h (revision 4791) +++ trunk/src/plug_io.h (revision 4792) @@ -111,7 +111,7 @@ int SaveBufferElements(const char *, const char *fmt); void pcb_sort_netlist(void); void PrintQuotedString(FILE *, const char *); -void sort_library(LibraryTypePtr lib); +void sort_library(pcb_lib_t *lib); void set_some_route_style(); int WritePCBFile(const char *Filename, pcb_bool thePcb, const char *fmt, pcb_bool emergency); int WritePipe(const char *, pcb_bool, const char *fmt); Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 4791) +++ trunk/src/rats.c (revision 4792) @@ -64,7 +64,7 @@ static pcb_bool DrawShortestRats(NetListTypePtr, void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)); static pcb_bool GatherSubnets(NetListTypePtr, pcb_bool, pcb_bool); -static pcb_bool CheckShorts(LibraryMenuTypePtr); +static pcb_bool CheckShorts(pcb_lib_menu_t *); static void TransferNet(NetListTypePtr, pcb_net_t *, pcb_net_t *); /* --------------------------------------------------------------------------- @@ -153,7 +153,7 @@ * parse a netlist menu entry and locate the corresponding pad * returns pcb_true if found, and fills in Connection information */ -pcb_bool SeekPad(LibraryEntryType * entry, pcb_connection_t * conn, pcb_bool Same) +pcb_bool SeekPad(pcb_lib_entry_t * entry, pcb_connection_t * conn, pcb_bool Same) { int j; char ElementName[256]; @@ -184,7 +184,7 @@ * Read the library-netlist build a pcb_true Netlist structure */ -NetListTypePtr ProcNetlist(LibraryTypePtr net_menu) +NetListTypePtr ProcNetlist(pcb_lib_t *net_menu) { pcb_connection_t *connection; pcb_connection_t LastPoint; @@ -309,7 +309,7 @@ memset(&Netl->Net[Netl->NetN], 0, sizeof(pcb_net_t)); } -static pcb_bool CheckShorts(LibraryMenuTypePtr theNet) +static pcb_bool CheckShorts(pcb_lib_menu_t *theNet) { pcb_bool newone, warn = pcb_false; PointerListTypePtr generic = (PointerListTypePtr) calloc(1, sizeof(PointerListType)); @@ -344,7 +344,7 @@ menu = GetPointerMemory(generic); *menu = pin->Spare; Message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to net \"%s\"\n"), - &theNet->Name[2], &((LibraryMenuTypePtr) (pin->Spare))->Name[2]); + &theNet->Name[2], &((pcb_lib_menu_t *) (pin->Spare))->Name[2]); stub_rat_found_short(pin, NULL, &theNet->Name[2]); } } @@ -375,7 +375,7 @@ menu = GetPointerMemory(generic); *menu = pad->Spare; Message(PCB_MSG_DEFAULT, _("Warning! Net \"%s\" is shorted to net \"%s\"\n"), - &theNet->Name[2], &((LibraryMenuTypePtr) (pad->Spare))->Name[2]); + &theNet->Name[2], &((pcb_lib_menu_t *) (pad->Spare))->Name[2]); stub_rat_found_short(NULL, pad, &theNet->Name[2]); } } @@ -815,8 +815,8 @@ char ratname[20]; int found; void *ptr1, *ptr2, *ptr3; - LibraryMenuTypePtr menu; - LibraryEntryTypePtr entry; + pcb_lib_menu_t *menu; + pcb_lib_entry_t *entry; if (Crosshair.AttachedLine.Point1.X == Crosshair.AttachedLine.Point2.X && Crosshair.AttachedLine.Point1.Y == Crosshair.AttachedLine.Point2.Y) Index: trunk/src/rats.h =================================================================== --- trunk/src/rats.h (revision 4791) +++ trunk/src/rats.h (revision 4792) @@ -44,7 +44,7 @@ long int type; /* type of object in ptr1 - 3 */ void *ptr1, *ptr2; /* the object of the connection */ pcb_cardinal_t group; /* the layer group of the connection */ - LibraryMenuType *menu; /* the netmenu this *SHOULD* belong too */ + pcb_lib_menu_t *menu; /* the netmenu this *SHOULD* belong too */ }; pcb_rat_t *AddNet(void); @@ -51,9 +51,9 @@ char *ConnectionName(int, void *, void *); pcb_bool AddAllRats(pcb_bool, void (*)(register pcb_connection_t *, register pcb_connection_t *, register RouteStyleTypePtr)); -pcb_bool SeekPad(LibraryEntryTypePtr, pcb_connection_t *, pcb_bool); +pcb_bool SeekPad(pcb_lib_entry_t *, pcb_connection_t *, pcb_bool); -NetListTypePtr ProcNetlist(LibraryTypePtr); +NetListTypePtr ProcNetlist(pcb_lib_t *); NetListListType CollectSubnets(pcb_bool); pcb_connection_t *GetConnectionMemory(pcb_net_t *); Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 4791) +++ trunk/src/rats_patch.c (revision 4792) @@ -148,7 +148,7 @@ } } -static void netlist_free(LibraryTypePtr dst) +static void netlist_free(pcb_lib_t *dst) { int n, p; @@ -156,10 +156,10 @@ return; for (n = 0; n < dst->MenuN; n++) { - LibraryMenuTypePtr dmenu = &dst->Menu[n]; + pcb_lib_menu_t *dmenu = &dst->Menu[n]; free(dmenu->Name); for (p = 0; p < dmenu->EntryN; p++) { - LibraryEntryTypePtr dentry = &dmenu->Entry[p]; + pcb_lib_entry_t *dentry = &dmenu->Entry[p]; free((char*)dentry->ListEntry); } free(dmenu->Entry); @@ -168,24 +168,24 @@ dst->Menu = NULL; } -static void netlist_copy(LibraryTypePtr dst, LibraryTypePtr src) +static void netlist_copy(pcb_lib_t *dst, pcb_lib_t *src) { int n, p; dst->MenuMax = dst->MenuN = src->MenuN; if (src->MenuN != 0) { - dst->Menu = calloc(sizeof(LibraryMenuType), dst->MenuN); + dst->Menu = calloc(sizeof(pcb_lib_menu_t), dst->MenuN); for (n = 0; n < src->MenuN; n++) { - LibraryMenuTypePtr smenu = &src->Menu[n]; - LibraryMenuTypePtr dmenu = &dst->Menu[n]; + pcb_lib_menu_t *smenu = &src->Menu[n]; + pcb_lib_menu_t *dmenu = &dst->Menu[n]; /* fprintf(stderr, "Net %d name='%s': ", n, smenu->Name+2);*/ dmenu->Name = pcb_strdup(smenu->Name); dmenu->EntryMax = dmenu->EntryN = smenu->EntryN; - dmenu->Entry = calloc(sizeof(LibraryEntryType), dmenu->EntryN); + dmenu->Entry = calloc(sizeof(pcb_lib_entry_t), dmenu->EntryN); dmenu->flag = smenu->flag; dmenu->internal = smenu->internal; for (p = 0; p < smenu->EntryN; p++) { - LibraryEntryTypePtr sentry = &smenu->Entry[p]; - LibraryEntryTypePtr dentry = &dmenu->Entry[p]; + pcb_lib_entry_t *sentry = &smenu->Entry[p]; + pcb_lib_entry_t *dentry = &dmenu->Entry[p]; dentry->ListEntry = pcb_strdup(sentry->ListEntry); dentry->ListEntry_dontfree = 0; /* fprintf (stderr, " '%s'/%p", dentry->ListEntry, dentry->ListEntry);*/ @@ -203,16 +203,16 @@ int n; for (n = 0; n < pcb->NetlistLib[NETLIST_EDITED].MenuN; n++) { - LibraryMenuTypePtr menu = &pcb->NetlistLib[NETLIST_EDITED].Menu[n]; + pcb_lib_menu_t *menu = &pcb->NetlistLib[NETLIST_EDITED].Menu[n]; if (strcmp(menu->Name + 2, patch->arg1.net_name) == 0) { int p; for (p = 0; p < menu->EntryN; p++) { - LibraryEntryTypePtr entry = &menu->Entry[p]; + pcb_lib_entry_t *entry = &menu->Entry[p]; /* fprintf (stderr, "C'%s'/%p '%s'/%p\n", entry->ListEntry, entry->ListEntry, patch->id, patch->id);*/ if (strcmp(entry->ListEntry, patch->id) == 0) { if (del) { /* want to delete and it's on the list */ - memmove(&menu->Entry[p], &menu->Entry[p + 1], (menu->EntryN - p - 1) * sizeof(LibraryEntryType)); + memmove(&menu->Entry[p], &menu->Entry[p + 1], (menu->EntryN - p - 1) * sizeof(pcb_lib_entry_t)); menu->EntryN--; return 0; } @@ -232,7 +232,7 @@ /* couldn't find the net: create it */ { - LibraryMenuType *net = NULL; + pcb_lib_menu_t *net = NULL; net = CreateNewNet(&pcb->NetlistLib[NETLIST_EDITED], patch->arg1.net_name, NULL); if (net == NULL) return 1; @@ -266,12 +266,12 @@ rats_patch_apply(pcb, n); } -static LibraryMenuTypePtr rats_patch_find_net(pcb_board_t *pcb, const char *netname, int listidx) +static pcb_lib_menu_t *rats_patch_find_net(pcb_board_t *pcb, const char *netname, int listidx) { int n; for (n = 0; n < pcb->NetlistLib[listidx].MenuN; n++) { - LibraryMenuTypePtr menu = &pcb->NetlistLib[listidx].Menu[n]; + pcb_lib_menu_t *menu = &pcb->NetlistLib[listidx].Menu[n]; if (strcmp(menu->Name + 2, netname) == 0) return menu; } @@ -292,7 +292,7 @@ case RATP_ADD_CONN: case RATP_DEL_CONN: if (htsp_get(seen, n->arg1.net_name) == NULL) { - LibraryMenuTypePtr net; + pcb_lib_menu_t *net; int p; net = rats_patch_find_net(pcb, n->arg1.net_name, NETLIST_INPUT); @@ -301,7 +301,7 @@ htsp_set(seen, n->arg1.net_name, net); cb(ctx, PCB_RPE_INFO_BEGIN, n->arg1.net_name, NULL, NULL); for (p = 0; p < net->EntryN; p++) { - LibraryEntryTypePtr entry = &net->Entry[p]; + pcb_lib_entry_t *entry = &net->Entry[p]; cb(ctx, PCB_RPE_INFO_TERMINAL, n->arg1.net_name, NULL, entry->ListEntry); } cb(ctx, PCB_RPE_INFO_END, n->arg1.net_name, NULL, NULL); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 4791) +++ trunk/src/select.c (revision 4792) @@ -981,7 +981,7 @@ MENU_LOOP(&(PCB->NetlistLib[NETLIST_EDITED])); { pcb_cardinal_t i; - LibraryEntryType *entry; + pcb_lib_entry_t *entry; pcb_connection_t conn; /* Name[0] and Name[1] are special purpose, not the actual name */ Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4791) +++ trunk/src/undo.c (revision 4792) @@ -113,8 +113,8 @@ } AngleChangeType; typedef struct { /* information about netlist lib changes */ - LibraryTypePtr old; - LibraryTypePtr lib; + pcb_lib_t *old; + pcb_lib_t *lib; } NetlistChangeType, *NetlistChangeTypePtr; typedef struct { /* holds information about an operation */ @@ -833,7 +833,7 @@ { NetlistChangeTypePtr l = &Entry->Data.NetlistChange; unsigned int i, j; - LibraryTypePtr lib, saved; + pcb_lib_t *lib, *saved; lib = l->lib; saved = l->old; @@ -1537,11 +1537,11 @@ /* --------------------------------------------------------------------------- * adds a netlist change to the undo list */ -void AddNetlistLibToUndoList(LibraryTypePtr lib) +void AddNetlistLibToUndoList(pcb_lib_t *lib) { UndoListTypePtr undo; unsigned int i, j; - LibraryTypePtr old; + pcb_lib_t *old; if (!Locked) { undo = GetUndoSlot(UNDO_NETLISTCHANGE, 0, 0); @@ -1549,11 +1549,11 @@ undo->Data.NetlistChange.lib = lib; /* and what the old data is that we'll need to restore */ - undo->Data.NetlistChange.old = (LibraryTypePtr) malloc(sizeof(LibraryTypePtr)); + undo->Data.NetlistChange.old = (pcb_lib_t *) malloc(sizeof(pcb_lib_t *)); old = undo->Data.NetlistChange.old; old->MenuN = lib->MenuN; old->MenuMax = lib->MenuMax; - old->Menu = (LibraryMenuTypePtr) malloc(old->MenuMax * sizeof(LibraryMenuType)); + old->Menu = (pcb_lib_menu_t *) malloc(old->MenuMax * sizeof(pcb_lib_menu_t)); if (old->Menu == NULL) { fprintf(stderr, "malloc() failed in AddNetlistLibToUndoList\n"); exit(1); @@ -1571,7 +1571,7 @@ old->Menu[i].Style = lib->Menu[i].Style ? pcb_strdup(lib->Menu[i].Style) : NULL; - old->Menu[i].Entry = (LibraryEntryTypePtr) malloc(old->Menu[i].EntryMax * sizeof(LibraryEntryType)); + old->Menu[i].Entry = (pcb_lib_entry_t *) malloc(old->Menu[i].EntryMax * sizeof(pcb_lib_entry_t)); if (old->Menu[i].Entry == NULL) { fprintf(stderr, "malloc() failed in AddNetlistLibToUndoList\n"); exit(1); Index: trunk/src/undo.h =================================================================== --- trunk/src/undo.h (revision 4791) +++ trunk/src/undo.h (revision 4792) @@ -63,7 +63,7 @@ void AddObjectToChangeRadiiUndoList(int, void *, void *, void *); void AddObjectToClearPolyUndoList(int, void *, void *, void *, pcb_bool); void AddLayerChangeToUndoList(int, int); -void AddNetlistLibToUndoList(LibraryTypePtr); +void AddNetlistLibToUndoList(pcb_lib_t *); void LockUndo(void); void UnlockUndo(void); pcb_bool Undoing(void); Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4791) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4792) @@ -391,7 +391,7 @@ FILE *fp; char nodename[256]; char net[256]; - LibraryMenuType *netname; + pcb_lib_menu_t *netname; IPCD356_AliasList *aliaslist; if (IPCD356_SanityCheck()) { /* Check for invalid names + numbers. */ Index: trunk/src_plugins/export_nelma/nelma.c =================================================================== --- trunk/src_plugins/export_nelma/nelma.c (revision 4791) +++ trunk/src_plugins/export_nelma/nelma.c (revision 4792) @@ -297,9 +297,9 @@ static void nelma_write_nets(FILE * out) { - LibraryType netlist; - LibraryMenuTypePtr net; - LibraryEntryTypePtr pin; + pcb_lib_t netlist; + pcb_lib_menu_t *net; + pcb_lib_entry_t *pin; int n, m, i, idx; @@ -341,9 +341,9 @@ static void nelma_write_layer(FILE * out, int z, int h, const char *name, int full, const char *mat) { - LibraryType netlist; - LibraryMenuTypePtr net; - LibraryEntryTypePtr pin; + pcb_lib_t netlist; + pcb_lib_menu_t *net; + pcb_lib_entry_t *pin; int n, m; @@ -413,7 +413,7 @@ } } -static void nelma_write_object(FILE * out, LibraryEntryTypePtr pin) +static void nelma_write_object(FILE * out, pcb_lib_entry_t *pin) { int i, idx; Coord px = 0, py = 0; @@ -451,9 +451,9 @@ static void nelma_write_objects(FILE * out) { - LibraryType netlist; - LibraryMenuTypePtr net; - LibraryEntryTypePtr pin; + pcb_lib_t netlist; + pcb_lib_menu_t *net; + pcb_lib_entry_t *pin; int n, m; Index: trunk/src_plugins/hid_gtk/gui-netlist-window.c =================================================================== --- trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4791) +++ trunk/src_plugins/hid_gtk/gui-netlist-window.c (revision 4792) @@ -65,8 +65,8 @@ static gboolean selection_holdoff; -static LibraryMenuType *selected_net; -static LibraryMenuType *node_selected_net; +static pcb_lib_menu_t *selected_net; +static pcb_lib_menu_t *node_selected_net; /* The Netlist window displays all the layout nets in a left treeview @@ -104,7 +104,7 @@ */ -/* -------- The netlist nodes (LibraryEntryType) data model ---------- +/* -------- The netlist nodes (pcb_lib_entry_t) data model ---------- | Each time a net is selected in the left treeview, this node model | is recreated containing all the nodes (pins/pads) that are connected | to the net. Loading the new model will update the right treeview with @@ -113,14 +113,14 @@ | The terminology is a bit confusing because the PCB netlist data | structures are generic structures used for library elements, netlist | data, and possibly other things also. The mapping is that - | the layout netlist data structure is a LibraryType which - | contains an allocated array of LibraryMenuType structs. Each of these + | the layout netlist data structure is a pcb_lib_t which + | contains an allocated array of pcb_lib_menu_t structs. Each of these | structs represents a net in the netlist and contains an array - | of LibraryEntryType structs which represent the nodes connecting to + | of pcb_lib_entry_t structs which represent the nodes connecting to | the net. So we have: | | Nets Nodes - | LibraryType LibraryMenuType LibraryEntryType + | pcb_lib_t pcb_lib_menu_t pcb_lib_entry_t | ------------------------------------------------------- | PCB->NetlistLib------Menu[0]-----------Entry[0] | | Entry[1] @@ -136,18 +136,18 @@ | names would be nodes C101-1, R101-2, etc */ -LibraryEntryType *node_get_node_from_name(gchar * node_name, LibraryMenuType ** node_net); +pcb_lib_entry_t *node_get_node_from_name(gchar * node_name, pcb_lib_menu_t ** node_net); enum { NODE_NAME_COLUMN, /* Name to show in the treeview */ - NODE_LIBRARY_COLUMN, /* Pointer to this node (LibraryEntryType) */ + NODE_LIBRARY_COLUMN, /* Pointer to this node (pcb_lib_entry_t) */ N_NODE_COLUMNS }; -/* Given a net in the netlist (a LibraryMenuType) put all the Entry[] +/* Given a net in the netlist (a pcb_lib_menu_t) put all the Entry[] | names (the nodes) into a newly created node tree model. */ -static GtkTreeModel *node_model_create(LibraryMenuType * menu) +static GtkTreeModel *node_model_create(pcb_lib_menu_t * menu) { GtkListStore *store; GtkTreeIter iter; @@ -173,7 +173,7 @@ | Create a new model containing the nodes of the given net, insert | the model into the treeview and unref the old model. */ -static void node_model_update(LibraryMenuType * menu) +static void node_model_update(pcb_lib_menu_t * menu) { GtkTreeModel *model; @@ -195,7 +195,7 @@ g_object_unref(G_OBJECT(model)); } -static void toggle_pin_selected(LibraryEntryType * entry) +static void toggle_pin_selected(pcb_lib_entry_t * entry) { pcb_connection_t conn; @@ -214,8 +214,8 @@ { GtkTreeIter iter; GtkTreeModel *model; - LibraryMenuType *node_net; - LibraryEntryType *node; + pcb_lib_menu_t *node_net; + pcb_lib_entry_t *node; pcb_connection_t conn; Coord x, y; static gchar *node_name; @@ -249,7 +249,7 @@ } /* From the treeview row, extract the node pointer stored there and - | we've got a pointer to the LibraryEntryType (node) the row + | we've got a pointer to the pcb_lib_entry_t (node) the row | represents. */ gtk_tree_model_get(model, &iter, NODE_LIBRARY_COLUMN, &node, -1); @@ -287,7 +287,7 @@ } -/* -------- The net (LibraryMenuType) data model ---------- +/* -------- The net (pcb_lib_menu_t) data model ---------- */ /* TODO: the enable and disable all nets. Can't seem to get how that's | supposed to work, but it'll take updating the NET_ENABLED_COLUMN in @@ -300,7 +300,7 @@ enum { NET_ENABLED_COLUMN, /* If enabled will be ' ', if disable '*' */ NET_NAME_COLUMN, /* Name to show in the treeview */ - NET_LIBRARY_COLUMN, /* Pointer to this net (LibraryMenuType) */ + NET_LIBRARY_COLUMN, /* Pointer to this net (pcb_lib_menu_t) */ N_NET_COLUMNS }; @@ -415,7 +415,7 @@ GtkTreeModel *model; GtkTreeIter iter; gchar *str; - LibraryMenuType *menu; + pcb_lib_menu_t *menu; model = gtk_tree_view_get_model(treeview); if (gtk_tree_model_get_iter(model, &iter, path)) { @@ -446,7 +446,7 @@ { GtkTreeIter iter; GtkTreeModel *model; - LibraryMenuType *net; + pcb_lib_menu_t *net; if (selection_holdoff) /* PCB is highlighting, user is not selecting */ return; @@ -457,7 +457,7 @@ return; } - /* Get a pointer, net, to the LibraryMenuType of the newly selected + /* Get a pointer, net, to the pcb_lib_menu_t of the newly selected | netlist row, and create a new node model from the net entries | and insert that model into the node view. Delete old entry model. */ @@ -471,7 +471,7 @@ { GtkTreeIter iter; gboolean active = gtk_toggle_button_get_active(button); - LibraryMenuType *menu; + pcb_lib_menu_t *menu; /* Get each net iter and change the NET_ENABLED_COLUMN to a "*" or "" | to flag it as disabled or enabled based on toggle button state. @@ -490,7 +490,7 @@ */ static void netlist_select_cb(GtkWidget * widget, gpointer data) { - LibraryEntryType *entry; + pcb_lib_entry_t *entry; pcb_connection_t conn; gint i; gboolean select_flag = GPOINTER_TO_INT(data); @@ -558,8 +558,8 @@ } /**/ typedef struct { - LibraryEntryType *ret_val; - LibraryMenuType *node_net; + pcb_lib_entry_t *ret_val; + pcb_lib_menu_t *node_net; const gchar *node_name; pcb_bool found; } node_get_node_from_name_state; @@ -566,8 +566,8 @@ static gboolean node_get_node_from_name_helper(GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data) { - LibraryMenuType *net; - LibraryEntryType *node; + pcb_lib_menu_t *net; + pcb_lib_entry_t *node; node_get_node_from_name_state *state = data; gtk_tree_model_get(net_model, iter, NET_LIBRARY_COLUMN, &net, -1); @@ -587,7 +587,7 @@ return FALSE; } -LibraryEntryType *node_get_node_from_name(gchar * node_name, LibraryMenuType ** node_net) +pcb_lib_entry_t *node_get_node_from_name(gchar * node_name, pcb_lib_menu_t ** node_net) { node_get_node_from_name_state state; @@ -774,7 +774,7 @@ struct ggnfnn_task { gboolean enabled_only; const gchar *node_name; - LibraryMenuType *found_net; + pcb_lib_menu_t *found_net; GtkTreeIter iter; }; @@ -781,8 +781,8 @@ static gboolean hunt_named_node(GtkTreeModel * model, GtkTreePath * path, GtkTreeIter * iter, gpointer data) { struct ggnfnn_task *task = (struct ggnfnn_task *) data; - LibraryMenuType *net; - LibraryEntryType *node; + pcb_lib_menu_t *net; + pcb_lib_entry_t *node; gchar *str; gint j; gboolean is_disabled; @@ -811,7 +811,7 @@ return FALSE; } -LibraryMenuType *ghid_get_net_from_node_name(const gchar * node_name, gboolean enabled_only) +pcb_lib_menu_t *ghid_get_net_from_node_name(const gchar * node_name, gboolean enabled_only) { GtkTreePath *path; struct ggnfnn_task task; @@ -820,7 +820,7 @@ return NULL; /* Have to force the netlist window created because we need the treeview - | models constructed so we can find the LibraryMenuType pointer the + | models constructed so we can find the pcb_lib_menu_t pointer the | caller wants. */ ghid_netlist_window_create(gport); @@ -860,7 +860,7 @@ { GtkTreePath *path; GtkTreeIter iter; - LibraryMenuType *net; + pcb_lib_menu_t *net; gchar *name; if (!node_name) Index: trunk/src_plugins/hid_gtk/gui.h =================================================================== --- trunk/src_plugins/hid_gtk/gui.h (revision 4791) +++ trunk/src_plugins/hid_gtk/gui.h (revision 4792) @@ -379,7 +379,7 @@ void ghid_netlist_window_show(GHidPort * out, gboolean raise); void ghid_netlist_window_update(gboolean init_nodes); -LibraryMenuType *ghid_get_net_from_node_name(const gchar * name, gboolean); +pcb_lib_menu_t *ghid_get_net_from_node_name(const gchar * name, gboolean); void ghid_netlist_highlight_node(const gchar * name); Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 4791) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 4792) @@ -36,7 +36,7 @@ static void pick_net(int pick) { - LibraryMenuType *menu = PCB->NetlistLib[NETLIST_EDITED].Menu + pick; + pcb_lib_menu_t *menu = PCB->NetlistLib[NETLIST_EDITED].Menu + pick; int i; if (pick == last_pick) @@ -59,7 +59,7 @@ { XmString str; int pos = cbs->item_position; - LibraryMenuTypePtr net = &(PCB->NetlistLib[NETLIST_EDITED].Menu[pos - 1]); + pcb_lib_menu_t *net = &(PCB->NetlistLib[NETLIST_EDITED].Menu[pos - 1]); char *name = net->Name; if (name[0] == ' ') { name[0] = '*'; @@ -82,9 +82,9 @@ pick_net(cbs->item_position - 1); } -typedef void (*Std_Nbcb_Func) (LibraryMenuTypePtr, int); +typedef void (*Std_Nbcb_Func) (pcb_lib_menu_t *, int); -static void nbcb_rat_on(LibraryMenuTypePtr net, int pos) +static void nbcb_rat_on(pcb_lib_menu_t *net, int pos) { XmString str; char *name = net->Name; @@ -95,7 +95,7 @@ XmStringFree(str); } -static void nbcb_rat_off(LibraryMenuTypePtr net, int pos) +static void nbcb_rat_off(pcb_lib_menu_t *net, int pos) { XmString str; char *name = net->Name; @@ -109,9 +109,9 @@ /* Select on the layout the current net treeview selection */ -static void nbcb_select_common(LibraryMenuTypePtr net, int pos, int select_flag) +static void nbcb_select_common(pcb_lib_menu_t *net, int pos, int select_flag) { - LibraryEntryType *entry; + pcb_lib_entry_t *entry; pcb_connection_t conn; int i; @@ -129,17 +129,17 @@ Draw(); } -static void nbcb_select(LibraryMenuTypePtr net, int pos) +static void nbcb_select(pcb_lib_menu_t *net, int pos) { nbcb_select_common(net, pos, 1); } -static void nbcb_deselect(LibraryMenuTypePtr net, int pos) +static void nbcb_deselect(pcb_lib_menu_t *net, int pos) { nbcb_select_common(net, pos, 0); } -static void nbcb_find(LibraryMenuTypePtr net, int pos) +static void nbcb_find(pcb_lib_menu_t *net, int pos) { char *name = net->Name + 2; hid_actionl("netlist", "find", name, NULL); @@ -154,7 +154,7 @@ if (v == nbcb_find) hid_actionl("connection", "reset", NULL); for (i = 0; i < posc; i++) { - LibraryMenuTypePtr net = &(PCB->NetlistLib[NETLIST_EDITED].Menu[posl[i] - 1]); + pcb_lib_menu_t *net = &(PCB->NetlistLib[NETLIST_EDITED].Menu[posl[i] - 1]); v(net, posl[i]); } stdarg_n = 0; @@ -198,7 +198,7 @@ static void netnode_browse(Widget w, XtPointer v, XmListCallbackStruct * cbs) { - LibraryMenuType *menu = PCB->NetlistLib[NETLIST_EDITED].Menu + last_pick; + pcb_lib_menu_t *menu = PCB->NetlistLib[NETLIST_EDITED].Menu + last_pick; const char *name = menu->Entry[cbs->item_position - 1].ListEntry; char *ename, *pname; @@ -378,7 +378,7 @@ return 0; if (argc == 1) { - LibraryMenuTypePtr net; + pcb_lib_menu_t *net; net = pcb_netnode_to_netname(argv[0]); if (net) { Index: trunk/src_plugins/import_edif/edif.c =================================================================== --- trunk/src_plugins/import_edif/edif.c (revision 4791) +++ trunk/src_plugins/import_edif/edif.c (revision 4792) @@ -109,8 +109,8 @@ #include "compat_nls.h" /* from mymem.h, not include because of the malloc junk */ -LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr, int *idx); -LibraryEntryTypePtr GetLibraryEntryMemory(LibraryMenuTypePtr); +pcb_lib_menu_t *GetLibraryMenuMemory(pcb_lib_t *, int *idx); +pcb_lib_entry_t *GetLibraryEntryMemory(pcb_lib_menu_t *); /* @@ -179,8 +179,8 @@ str_pair* node; char* buf; char* p; - LibraryEntryTypePtr entry; - LibraryMenuTypePtr menu = GetLibraryMenuMemory(&PCB->NetlistLib[NETLIST_INPUT], NULL); + pcb_lib_entry_t *entry; + pcb_lib_menu_t *menu = GetLibraryMenuMemory(&PCB->NetlistLib[NETLIST_INPUT], NULL); if ( !name->str1 ) { Index: trunk/src_plugins/import_edif/edif.y =================================================================== --- trunk/src_plugins/import_edif/edif.y (revision 4791) +++ trunk/src_plugins/import_edif/edif.y (revision 4792) @@ -36,8 +36,8 @@ #include "compat_nls.h" /* from mymem.h, not include because of the malloc junk */ -LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr, int *idx); -LibraryEntryTypePtr GetLibraryEntryMemory(LibraryMenuTypePtr); +pcb_lib_menu_t *GetLibraryMenuMemory(pcb_lib_t *, int *idx); +pcb_lib_entry_t *GetLibraryEntryMemory(pcb_lib_menu_t *); /* @@ -106,8 +106,8 @@ str_pair* node; char* buf; char* p; - LibraryEntryTypePtr entry; - LibraryMenuTypePtr menu = GetLibraryMenuMemory(&PCB->NetlistLib[NETLIST_INPUT], NULL); + pcb_lib_entry_t *entry; + pcb_lib_menu_t *menu = GetLibraryMenuMemory(&PCB->NetlistLib[NETLIST_INPUT], NULL); if ( !name->str1 ) { Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 4791) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 4792) @@ -53,8 +53,8 @@ char inputline[MAX_NETLIST_LINE_LENGTH + 1]; char temp[MAX_NETLIST_LINE_LENGTH + 1]; FILE *fp; - LibraryMenuTypePtr menu = NULL; - LibraryEntryTypePtr entry; + pcb_lib_menu_t *menu = NULL; + pcb_lib_entry_t *entry; int i, j, lines, kind; pcb_bool continued; int used_popen = 0; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4791) +++ trunk/src_plugins/io_kicad/write.c (revision 4792) @@ -1001,8 +1001,8 @@ { int n; /* code mostly lifted from netlist.c */ int netNumber; - LibraryMenuTypePtr menu; - LibraryEntryTypePtr netlist; + pcb_lib_menu_t *menu; + pcb_lib_entry_t *netlist; /* first we write a default netlist for the 0 net, which is for unconnected pads in pcbnew */ fprintf(FP, "\n%*s(net 0 \"\")\n", indentation, ""); @@ -1048,8 +1048,8 @@ const char * currentElementRef; const char * currentElementVal; - LibraryMenuTypePtr current_pin_menu; - LibraryMenuTypePtr current_pad_menu; + pcb_lib_menu_t *current_pin_menu; + pcb_lib_menu_t *current_pad_menu; int silkLayer = 21; /* hard coded default, 20 is bottom silk */ int copperLayer = 15; /* hard coded default, 0 is bottom copper */ Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4791) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4792) @@ -961,8 +961,8 @@ { int n; /* code mostly lifted from netlist.c */ int netNumber; - LibraryMenuTypePtr menu; - LibraryEntryTypePtr netlist; + pcb_lib_menu_t *menu; + pcb_lib_entry_t *netlist; /* first we write a default netlist for the 0 net, which is for unconnected pads in pcbnew */ fputs("$EQUIPOT\n",FP); @@ -1000,8 +1000,8 @@ pcb_element_t *element; unm_t group1; /* group used to deal with missing names and provide unique ones if needed */ const char * currentElementName; - LibraryMenuTypePtr current_pin_menu; - LibraryMenuTypePtr current_pad_menu; + pcb_lib_menu_t *current_pin_menu; + pcb_lib_menu_t *current_pad_menu; int silkLayer = 21; /* hard coded default, 20 is bottom silk */ int copperLayer = 15; /* hard coded default, 0 is bottom copper */ Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4791) +++ trunk/src_plugins/io_lihata/read.c (revision 4792) @@ -845,7 +845,7 @@ return 0; } -static int parse_netlist_input(LibraryType *lib, lht_node_t *netlist) +static int parse_netlist_input(pcb_lib_t *lib, lht_node_t *netlist) { lht_node_t *nnet; if (netlist->type != LHT_LIST) @@ -853,7 +853,7 @@ for(nnet = netlist->data.list.first; nnet != NULL; nnet = nnet->next) { lht_node_t *nconn, *nstyle, *nt; - LibraryMenuType *net; + pcb_lib_menu_t *net; const char *style = NULL; if (nnet->type != LHT_HASH) Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4791) +++ trunk/src_plugins/io_lihata/write.c (revision 4792) @@ -583,7 +583,7 @@ } /* Build a plain old netlist */ -static lht_node_t *build_netlist(LibraryType *netlist, const char *name, int *nonempty) +static lht_node_t *build_netlist(pcb_lib_t *netlist, const char *name, int *nonempty) { lht_node_t *nl, *pl, *pn, *nnet; pcb_cardinal_t n, p; @@ -595,7 +595,7 @@ nl = lht_dom_node_alloc(LHT_LIST, name); for (n = 0; n < netlist->MenuN; n++) { - LibraryMenuTypePtr menu = &netlist->Menu[n]; + pcb_lib_menu_t *menu = &netlist->Menu[n]; const char *netname = &menu->Name[2]; const char *style = menu->Style; @@ -608,7 +608,7 @@ /* grow the connection list */ for (p = 0; p < menu->EntryN; p++) { - LibraryEntryTypePtr entry = &menu->Entry[p]; + pcb_lib_entry_t *entry = &menu->Entry[p]; const char *pin = entry->ListEntry; pn = lht_dom_node_alloc(LHT_TEXT, ""); pn->data.text.value = pcb_strdup(pin); @@ -682,7 +682,7 @@ } -static lht_node_t *build_netlists(pcb_board_t *pcb, LibraryType *netlists, pcb_ratspatch_line_t *pat, int num_netlists) +static lht_node_t *build_netlists(pcb_board_t *pcb, pcb_lib_t *netlists, pcb_ratspatch_line_t *pat, int num_netlists) { lht_node_t *nls; int n, nonempty = 0; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4791) +++ trunk/src_plugins/io_pcb/file.c (revision 4792) @@ -333,7 +333,7 @@ fprintf(FP, "NetList()\n(\n"); for (n = 0; n < PCB->NetlistLib[NETLIST_INPUT].MenuN; n++) { - LibraryMenuTypePtr menu = &PCB->NetlistLib[NETLIST_INPUT].Menu[n]; + pcb_lib_menu_t *menu = &PCB->NetlistLib[NETLIST_INPUT].Menu[n]; fprintf(FP, "\tNet("); PrintQuotedString(FP, &menu->Name[2]); fprintf(FP, " "); @@ -340,7 +340,7 @@ PrintQuotedString(FP, (char *) UNKNOWN(menu->Style)); fprintf(FP, ")\n\t(\n"); for (p = 0; p < menu->EntryN; p++) { - LibraryEntryTypePtr entry = &menu->Entry[p]; + pcb_lib_entry_t *entry = &menu->Entry[p]; fprintf(FP, "\t\tConnect("); PrintQuotedString(FP, entry->ListEntry); fprintf(FP, ")\n"); Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4791) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4792) @@ -124,7 +124,7 @@ static pcb_polygon_t *Polygon; static pcb_symbol_t *Symbol; static int pin_num; -static LibraryMenuTypePtr Menu; +static pcb_lib_menu_t *Menu; static pcb_bool LayerFlag[MAX_LAYER + 2]; extern char *yytext; /* defined by LEX */ @@ -2824,7 +2824,7 @@ case 183: #line 1865 "parse_y.y" /* yacc.c:1646 */ { - Menu = CreateNewNet((LibraryTypePtr)&yyPCB->NetlistLib, (yyvsp[-3].string), (yyvsp[-2].string)); + Menu = CreateNewNet((pcb_lib_t *)&yyPCB->NetlistLib, (yyvsp[-3].string), (yyvsp[-2].string)); free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4791) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4792) @@ -61,7 +61,7 @@ static pcb_polygon_t *Polygon; static pcb_symbol_t *Symbol; static int pin_num; -static LibraryMenuTypePtr Menu; +static pcb_lib_menu_t *Menu; static pcb_bool LayerFlag[MAX_LAYER + 2]; extern char *yytext; /* defined by LEX */ @@ -1863,7 +1863,7 @@ /* name style pin pin ... */ : T_NET '(' STRING STRING ')' '(' { - Menu = CreateNewNet((LibraryTypePtr)&yyPCB->NetlistLib, $3, $4); + Menu = CreateNewNet((pcb_lib_t *)&yyPCB->NetlistLib, $3, $4); free ($3); free ($4); } Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 4791) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 4792) @@ -241,7 +241,7 @@ if (n->to_type == PCB_TYPE_PAD) spare = ((pcb_pad_t *) n->to)->Spare; if (spare != NULL) { - void *net = &(((LibraryMenuTypePtr) spare)->Name[2]); + void *net = &(((pcb_lib_menu_t *) spare)->Name[2]); debprintf(" net=%s\n", net); if (S == NULL) { debprintf(" -> became S\n"); @@ -380,7 +380,7 @@ if (!bad_gr) { /* check if the rest of the shorts affect the same nets - ignore them if so */ for (i = n->next; i != NULL; i = i->next) { - LibraryMenuType *spn, *spi; + pcb_lib_menu_t *spn, *spi; spn = (n->pin != NULL) ? n->pin->Spare : n->pad->Spare; spi = (i->pin != NULL) ? i->pin->Spare : i->pad->Spare; Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4791) +++ trunk/src_plugins/report/report.c (revision 4792) @@ -725,7 +725,7 @@ Coord length = 0; int found = 0; int i; - LibraryMenuType *net; + pcb_lib_menu_t *net; pcb_connection_t conn; int net_found = 0; int use_re = 0;