Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4868) +++ trunk/doc-rnd/hacking/renames (revision 4869) @@ -276,3 +276,8 @@ LinePadIntersect -> pcb_intersect_line_pad ArcPadIntersect -> pcb_intersect_arc_pad IsPolygonInPolygon -> pcb_is_poly_in_poly +LookupElementConnections -> pcb_lookup_element_conns +LookupConnectionsToAllElements -> pcb_lookup_conns_to_all_elements +LookupConnection -> pcb_lookup_conn +LookupConnectionByPin -> pcb_lookup_conn_by_pin +LookupUnusedPins -> pcb_lookup_unused_pins Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4868) +++ trunk/src/action_helper.c (revision 4869) @@ -499,7 +499,7 @@ } if (conf_core.editor.auto_drc && conf_core.editor.mode == PCB_MODE_LINE) { type = SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA, &ptr1, &ptr2, &ptr3); - LookupConnection(Crosshair.X, Crosshair.Y, pcb_true, 1, PCB_FLAG_FOUND); + pcb_lookup_conn(Crosshair.X, Crosshair.Y, pcb_true, 1, PCB_FLAG_FOUND); } if (type == PCB_TYPE_PIN || type == PCB_TYPE_VIA) { Crosshair.AttachedLine.Point1.X = Crosshair.AttachedLine.Point2.X = ((pcb_pin_t *) ptr2)->X; Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 4868) +++ trunk/src/file_act.c (revision 4869) @@ -281,7 +281,7 @@ FILE *fp; pcb_bool result; if ((fp = CheckAndOpenFile(name, pcb_true, pcb_false, &result, NULL)) != NULL) { - LookupConnectionsToAllElements(fp); + pcb_lookup_conns_to_all_elements(fp); fclose(fp); SetChangedFlag(pcb_true); } @@ -292,7 +292,7 @@ FILE *fp; pcb_bool result; if ((fp = CheckAndOpenFile(name, pcb_true, pcb_false, &result, NULL)) != NULL) { - LookupUnusedPins(fp); + pcb_lookup_unused_pins(fp); fclose(fp); SetChangedFlag(pcb_true); } @@ -308,7 +308,7 @@ if ((SearchScreen(Crosshair.X, Crosshair.Y, PCB_TYPE_ELEMENT, &ptrtmp, &ptrtmp, &ptrtmp)) != PCB_TYPE_NONE) { element = (pcb_element_t *) ptrtmp; if ((fp = CheckAndOpenFile(name, pcb_true, pcb_false, &result, NULL)) != NULL) { - LookupElementConnections(element, fp); + pcb_lookup_element_conns(element, fp); fclose(fp); SetChangedFlag(pcb_true); } Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 4868) +++ trunk/src/find.h (revision 4869) @@ -66,11 +66,11 @@ pcb_bool pcb_intersect_line_pad(pcb_line_t *, pcb_pad_t *); pcb_bool pcb_intersect_arc_pad(pcb_arc_t *, pcb_pad_t *); pcb_bool pcb_is_poly_in_poly(pcb_polygon_t *, pcb_polygon_t *); -void LookupElementConnections(pcb_element_t *, FILE *); -void LookupConnectionsToAllElements(FILE *); -void LookupConnection(pcb_coord_t, pcb_coord_t, pcb_bool, pcb_coord_t, int); -void LookupConnectionByPin(int type, void *ptr1); -void LookupUnusedPins(FILE *); +void pcb_lookup_element_conns(pcb_element_t *, FILE *); +void pcb_lookup_conns_to_all_elements(FILE *); +void pcb_lookup_conn(pcb_coord_t, pcb_coord_t, pcb_bool, pcb_coord_t, int); +void pcb_lookup_conn_by_pin(int type, void *ptr1); +void pcb_lookup_unused_pins(FILE *); pcb_bool ResetFoundLinesAndPolygons(pcb_bool); pcb_bool ResetFoundPinsViasAndPads(pcb_bool); pcb_bool ResetConnections(pcb_bool); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 4868) +++ trunk/src/find_misc.c (revision 4869) @@ -214,7 +214,7 @@ * the objects are re-drawn if AndDraw is pcb_true * also the action is marked as undoable if AndDraw is pcb_true */ -void LookupConnection(pcb_coord_t X, pcb_coord_t Y, pcb_bool AndDraw, pcb_coord_t Range, int which_flag) +void pcb_lookup_conn(pcb_coord_t X, pcb_coord_t Y, pcb_bool AndDraw, pcb_coord_t Range, int which_flag) { void *ptr1, *ptr2, *ptr3; char *name; @@ -264,7 +264,7 @@ FreeConnectionLookupMemory(); } -void LookupConnectionByPin(int type, void *ptr1) +void pcb_lookup_conn_by_pin(int type, void *ptr1) { User = 0; InitConnectionLookup(); Index: trunk/src/find_print.c =================================================================== --- trunk/src/find_print.c (revision 4868) +++ trunk/src/find_print.c (revision 4869) @@ -213,7 +213,7 @@ /* --------------------------------------------------------------------------- * find all unused pins of all element */ -void LookupUnusedPins(FILE * FP) +void pcb_lookup_unused_pins(FILE * FP) { /* reset all currently marked connections */ User = pcb_true; @@ -241,7 +241,7 @@ /* --------------------------------------------------------------------------- * find all connections to pins within one element */ -void LookupElementConnections(pcb_element_t *Element, FILE * FP) +void pcb_lookup_element_conns(pcb_element_t *Element, FILE * FP) { /* reset all currently marked connections */ User = pcb_true; @@ -262,7 +262,7 @@ /* --------------------------------------------------------------------------- * find all connections to pins of all element */ -void LookupConnectionsToAllElements(FILE * FP) +void pcb_lookup_conns_to_all_elements(FILE * FP) { /* reset all currently marked connections */ User = pcb_false; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 4868) +++ trunk/src/gui_act.c (revision 4869) @@ -383,7 +383,7 @@ pcb_draw(); } if (Crosshair.AttachedLine.State != STATE_FIRST) - LookupConnection(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, pcb_true, 1, PCB_FLAG_FOUND); + pcb_lookup_conn(Crosshair.AttachedLine.Point1.X, Crosshair.AttachedLine.Point1.Y, pcb_true, 1, PCB_FLAG_FOUND); } pcb_notify_crosshair_change(pcb_true); break; Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 4868) +++ trunk/src/netlist.c (revision 4869) @@ -120,7 +120,7 @@ pcb_coord_t x, y; if (pcb_pin_name_to_xy(net->Entry, &x, &y)) return; - LookupConnection(x, y, 1, 1, PCB_FLAG_FOUND); + pcb_lookup_conn(x, y, 1, 1, PCB_FLAG_FOUND); } void pcb_netlist_select(pcb_lib_menu_t * net, pcb_lib_entry_t * pin) @@ -128,7 +128,7 @@ pcb_coord_t x, y; if (pcb_pin_name_to_xy(net->Entry, &x, &y)) return; - LookupConnection(x, y, 1, 1, PCB_FLAG_SELECTED); + pcb_lookup_conn(x, y, 1, 1, PCB_FLAG_SELECTED); } void pcb_netlist_rats(pcb_lib_menu_t * net, pcb_lib_entry_t * pin) Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 4868) +++ trunk/src/rats_act.c (revision 4869) @@ -152,7 +152,7 @@ case F_Find: { gui->get_coords(_("Click on a connection"), &x, &y); - LookupConnection(x, y, pcb_true, 1, PCB_FLAG_FOUND); + pcb_lookup_conn(x, y, pcb_true, 1, PCB_FLAG_FOUND); break; } Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4868) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 4869) @@ -430,7 +430,7 @@ if (!TEST_FLAG(PCB_FLAG_VISIT, pin)) { ClearFlagOnLinesAndPolygons(pcb_true, PCB_FLAG_FOUND); ClearFlagOnPinsViasAndPads(pcb_true, PCB_FLAG_FOUND); - LookupConnectionByPin(PCB_TYPE_PIN, pin); + pcb_lookup_conn_by_pin(PCB_TYPE_PIN, pin); sprintf(nodename, "%s-%s", element->Name[1].TextString, pin->Number); netname = pcb_netnode_to_netname(nodename); /* pcb_message(PCB_MSG_INFO, "Netname: %s\n", netname->Name +2); */ @@ -448,7 +448,7 @@ if (!TEST_FLAG(PCB_FLAG_VISIT, pad)) { ClearFlagOnLinesAndPolygons(pcb_true, PCB_FLAG_FOUND); ClearFlagOnPinsViasAndPads(pcb_true, PCB_FLAG_FOUND); - LookupConnectionByPin(PCB_TYPE_PAD, pad); + pcb_lookup_conn_by_pin(PCB_TYPE_PAD, pad); sprintf(nodename, "%s-%s", element->Name[1].TextString, pad->Number); netname = pcb_netnode_to_netname(nodename); /* pcb_message(PCB_MSG_INFO, "Netname: %s\n", netname->Name +2); */ @@ -469,7 +469,7 @@ if (!TEST_FLAG(PCB_FLAG_VISIT, via)) { ClearFlagOnLinesAndPolygons(pcb_true, PCB_FLAG_FOUND); ClearFlagOnPinsViasAndPads(pcb_true, PCB_FLAG_FOUND); - LookupConnectionByPin(PCB_TYPE_PIN, via); + pcb_lookup_conn_by_pin(PCB_TYPE_PIN, via); strcpy(net, "N/C"); IPCD356_WriteNet(fp, net); } Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 4868) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 4869) @@ -147,7 +147,7 @@ old_cb = find_callback; find_callback = proc_short_cb; SaveFindFlag(PCB_FLAG_MINCUT); - LookupConnection(x, y, pcb_false, 1, PCB_FLAG_MINCUT); + pcb_lookup_conn(x, y, pcb_false, 1, PCB_FLAG_MINCUT); debprintf("- alloced for %d\n", (short_conns_maxid + 1)); lut_by_oid = calloc(sizeof(short_conn_t *), (short_conns_maxid + 1)); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4868) +++ trunk/src_plugins/report/report.c (revision 4869) @@ -515,7 +515,7 @@ /* NB: The third argument here, 'false' ensures LookupConnection * does not add its changes to the undo system. */ - LookupConnection(x, y, pcb_false, PCB->Grid, PCB_FLAG_FOUND); + pcb_lookup_conn(x, y, pcb_false, PCB->Grid, PCB_FLAG_FOUND); ALLLINE_LOOP(PCB->Data); {