Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4884) +++ trunk/doc-rnd/hacking/renames (revision 4885) @@ -325,3 +325,11 @@ ASSIGN_SQUARE -> PCB_FLAG_SQUARE_ASSIGN GET_INTCONN -> PCB_FLAG_INTCONN_GET TEST_ANY_THERMS -> PCB_FLAG_THERM_TEST_ANY +common_string_to_flags -> pcb_strflg_common_s2f +common_flags_to_string -> pcb_strflg_common_f2s +uninit_strflags_buf -> pcb_strflg_uninit_buf +uninit_strflags_layerlist -> pcb_strflg_uninit_layerlist +pcbflags_to_string -> pcb_strflg_board_f2s +string_to_pcbflags -> pcb_strflg_board_s2f +string_to_flags -> pcb_strflg_s2f +flags_to_string -> pcb_strflg_f2s Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 4884) +++ trunk/src/flag_str.c (revision 4885) @@ -84,7 +84,7 @@ /* * This helper function maintains a small list of buffers which are - * used by flags_to_string(). Each buffer is allocated from the heap, + * used by pcb_strflg_f2s(). Each buffer is allocated from the heap, * but the caller must not free them (they get realloced when they're * reused, but never completely freed). */ @@ -110,7 +110,7 @@ #undef B } -void uninit_strflags_buf(void) +void pcb_strflg_uninit_buf(void) { int n; for(n = 0; n < 10; n++) { @@ -147,7 +147,7 @@ return; } -void uninit_strflags_layerlist(void) +void pcb_strflg_uninit_layerlist(void) { if (layers != NULL) { free(layers); @@ -318,7 +318,7 @@ static pcb_flag_t empty_flags; -pcb_flag_t common_string_to_flags(const char *flagstring, int (*error) (const char *msg), pcb_flag_bits_t * flagbits, int n_flagbits) +pcb_flag_t pcb_strflg_common_s2f(const char *flagstring, int (*error) (const char *msg), pcb_flag_bits_t * flagbits, int n_flagbits) { const char *fp, *ep; int flen; @@ -403,9 +403,9 @@ return rv.Flags; } -pcb_flag_t string_to_flags(const char *flagstring, int (*error) (const char *msg)) +pcb_flag_t pcb_strflg_s2f(const char *flagstring, int (*error) (const char *msg)) { - return common_string_to_flags(flagstring, error, pcb_object_flagbits, ENTRIES(pcb_object_flagbits)); + return pcb_strflg_common_s2f(flagstring, error, pcb_object_flagbits, ENTRIES(pcb_object_flagbits)); } @@ -420,7 +420,7 @@ * forcibly set when vias are parsed. */ -char *common_flags_to_string(pcb_flag_t flags, int object_type, pcb_flag_bits_t * flagbits, int n_flagbits) +char *pcb_strflg_common_f2s(pcb_flag_t flags, int object_type, pcb_flag_bits_t * flagbits, int n_flagbits) { int len; int i; @@ -534,9 +534,9 @@ return buf; } -char *flags_to_string(pcb_flag_t flags, int object_type) +char *pcb_strflg_f2s(pcb_flag_t flags, int object_type) { - return common_flags_to_string(flags, object_type, pcb_object_flagbits, ENTRIES(pcb_object_flagbits)); + return pcb_strflg_common_f2s(flags, object_type, pcb_object_flagbits, ENTRIES(pcb_object_flagbits)); } @@ -569,12 +569,12 @@ #undef N -char *pcbflags_to_string(pcb_flag_t flags) +char *pcb_strflg_board_f2s(pcb_flag_t flags) { - return common_flags_to_string(flags, PCB_TYPEMASK_ALL, pcb_flagbits, ENTRIES(pcb_flagbits)); + return pcb_strflg_common_f2s(flags, PCB_TYPEMASK_ALL, pcb_flagbits, ENTRIES(pcb_flagbits)); } -pcb_flag_t string_to_pcbflags(const char *flagstring, int (*error) (const char *msg)) +pcb_flag_t pcb_strflg_board_s2f(const char *flagstring, int (*error) (const char *msg)) { - return common_string_to_flags(flagstring, error, pcb_flagbits, ENTRIES(pcb_flagbits)); + return pcb_strflg_common_s2f(flagstring, error, pcb_flagbits, ENTRIES(pcb_flagbits)); } Index: trunk/src/flag_str.h =================================================================== --- trunk/src/flag_str.h (revision 4884) +++ trunk/src/flag_str.h (revision 4885) @@ -55,22 +55,22 @@ /* When passed a string, parse it and return an appropriate set of flags. Errors cause error() to be called with a suitable message; if error is NULL, errors are ignored. */ -pcb_flag_t string_to_flags(const char *flagstring, int (*error) (const char *msg)); +pcb_flag_t pcb_strflg_s2f(const char *flagstring, int (*error) (const char *msg)); /* Given a set of flags for a given object type, return a string which can be output to a file. The returned pointer must not be freed. */ -char *flags_to_string(pcb_flag_t flags, int object_type); +char *pcb_strflg_f2s(pcb_flag_t flags, int object_type); /* same as above, for pcb level flags */ -char *pcbflags_to_string(pcb_flag_t flags); -pcb_flag_t string_to_pcbflags(const char *flagstring, int (*error) (const char *msg)); +char *pcb_strflg_board_f2s(pcb_flag_t flags); +pcb_flag_t pcb_strflg_board_s2f(const char *flagstring, int (*error) (const char *msg)); -void uninit_strflags_buf(void); -void uninit_strflags_layerlist(void); +void pcb_strflg_uninit_buf(void); +void pcb_strflg_uninit_layerlist(void); /* low level */ -pcb_flag_t common_string_to_flags(const char *flagstring, int (*error) (const char *msg), pcb_flag_bits_t * flagbits, int n_flagbits); -char *common_flags_to_string(pcb_flag_t flags, int object_type, pcb_flag_bits_t * flagbits, int n_flagbits); +pcb_flag_t pcb_strflg_common_s2f(const char *flagstring, int (*error) (const char *msg), pcb_flag_bits_t * flagbits, int n_flagbits); +char *pcb_strflg_common_f2s(pcb_flag_t flags, int object_type, pcb_flag_bits_t * flagbits, int n_flagbits); #endif Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 4884) +++ trunk/src/main.c (revision 4885) @@ -232,8 +232,8 @@ hid_uninit(); pcb_events_uninit(); - uninit_strflags_buf(); - uninit_strflags_layerlist(); + pcb_strflg_uninit_buf(); + pcb_strflg_uninit_layerlist(); fp_uninit(); fp_host_uninit(); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4884) +++ trunk/src/plug_io.c (revision 4885) @@ -406,7 +406,7 @@ * Flag helper functions */ -#define F2S(OBJ, TYPE) flags_to_string ((OBJ)->Flags, TYPE) +#define F2S(OBJ, TYPE) pcb_strflg_f2s((OBJ)->Flags, TYPE) /* --------------------------------------------------------------------------- */ Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4884) +++ trunk/src/undo.c (revision 4885) @@ -546,7 +546,7 @@ return (pcb_true); } pcb_message(PCB_MSG_DEFAULT, "hace Internal error: Can't find ID %d type %08x\n", Entry->ID, Entry->Kind); - pcb_message(PCB_MSG_DEFAULT, "for UndoFlag Operation. Previous flags: %s\n", flags_to_string(Entry->Data.Flags, 0)); + pcb_message(PCB_MSG_DEFAULT, "for UndoFlag Operation. Previous flags: %s\n", pcb_strflg_f2s(Entry->Data.Flags, 0)); return (pcb_false); } Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 4884) +++ trunk/src_plugins/djopt/djopt.c (revision 4885) @@ -498,7 +498,7 @@ pcb_line_t *nl; dprintf ("New line \033[35m%#mD to %#mD from l%d t%#mS c%#mS f%s\033[0m\n", - s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, flags_to_string(example->Flags, PCB_TYPE_LINE)); + s->x, s->y, e->x, e->y, layer, example->Thickness, example->Clearance, pcb_strflg_f2s(example->Flags, PCB_TYPE_LINE)); nl = create_pcb_line(layer, s->x, s->y, e->x, e->y, example->Thickness, example->Clearance, example->Flags); if (!nl) @@ -2174,7 +2174,7 @@ c[ci]->lines[li]->s->x, c[ci]->lines[li]->s->y, c[ci]->lines[li]->e->x, c[ci]->lines[li]->e->y, c[ci]->lines[li]->line->Thickness, - c[ci]->lines[li]->line->Clearance, flags_to_string(c[ci]->lines[li]->line->Flags, PCB_TYPE_LINE)); + c[ci]->lines[li]->line->Clearance, pcb_strflg_f2s(c[ci]->lines[li]->line->Flags, PCB_TYPE_LINE)); /* Pads are disqualified, as we want to mimic a trace line. */ if (c[ci]->lines[li]->line == (pcb_line_t *) c[ci]->pad) { dprintf(" bad, pad\n"); Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4884) +++ trunk/src_plugins/io_kicad/write.c (revision 4885) @@ -37,7 +37,7 @@ #include "netlist.h" #include "obj_all.h" -#define F2S(OBJ, TYPE) flags_to_string ((OBJ)->Flags, TYPE) +#define F2S(OBJ, TYPE) pcb_strflg_f2s((OBJ)->Flags, TYPE) /* layer "0" is first copper layer = "0. Back - Solder" * and layer "15" is "15. Front - Component" Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4884) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4885) @@ -37,7 +37,7 @@ #include "netlist.h" #include "obj_all.h" -#define F2S(OBJ, TYPE) flags_to_string ((OBJ)->Flags, TYPE) +#define F2S(OBJ, TYPE) pcb_strflg_f2s((OBJ)->Flags, TYPE) /* layer "0" is first copper layer = "0. Back - Solder" * and layer "15" is "15. Front - Component" Index: trunk/src_plugins/io_pcb/flags.h =================================================================== --- trunk/src_plugins/io_pcb/flags.h (revision 4884) +++ trunk/src_plugins/io_pcb/flags.h (nonexistent) @@ -1,119 +0,0 @@ -/* - * COPYRIGHT - * - * PCB, interactive printed circuit board design - * Copyright (C) 1994,1995,1996 Thomas Nau - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Contact addresses for paper mail and Email: - * Thomas Nau, Schlehenweg 15, 88471 Baustetten, Germany - * Thomas.Nau@rz.uni-ulm.de - * - */ - -#include "flag.h" - -char *pcbflags_to_string(pcb_flag_t flags); -pcb_flag_t string_to_pcbflags(const char *flagstring, int (*error) (const char *msg)); - -/* --------------------------------------------------------------------------- - * PCB flags - kept only for file format compatibility reasons; these bits - should be a mirror of booleans from the conf. - */ - -/* %start-doc pcbfile ~pcbflags -@node PCBFlags -@section PCBFlags -@table @code -@item 0x00001 -Pinout displays pin numbers instead of pin names. -@item 0x00002 -Use local reference for moves, by setting the mark at the beginning of -each move. -@item 0x00004 -When set, only polygons and their clearances are drawn, to see if -polygons have isolated regions. -@item 0x00008 -Display DRC region on crosshair. -@item 0x00010 -Do all move, mirror, rotate with rubberband connections. -@item 0x00020 -Display descriptions of elements, instead of refdes. -@item 0x00040 -Display names of elements, instead of refdes. -@item 0x00080 -Auto-DRC flag. When set, PCB doesn't let you place copper that -violates DRC. -@item 0x00100 -Enable 'all-direction' lines. -@item 0x00200 -Switch starting angle after each click. -@item 0x00400 -Force unique names on board. -@item 0x00800 -New lines/arc clear polygons. -@item 0x01000 -Crosshair snaps to pins and pads. -@item 0x02000 -Show the solder mask layer. -@item 0x04000 -Draw with thin lines. -@item 0x08000 -Move items orthogonally. -@item 0x10000 -Draw autoroute paths real-time. -@item 0x20000 -New polygons are full ones. -@item 0x40000 -Names are locked, the mouse cannot select them. -@item 0x80000 -Everything but names are locked, the mouse cannot select anything else. -@item 0x100000 -New polygons are full polygons. -@item 0x200000 -When set, element names are not drawn. -+@item 0x800000 -+snap to certain off-grid points. -+@item 0x1000000 -+highlight lines and arcs when the crosshair is on one of their endpoints. -@end table -%end-doc */ - -#define PCB_FLAGS 0x01ffffff /* all used flags */ - -#define SHOWNUMBERFLAG 0x00000001 -#define LOCALREFFLAG 0x00000002 -#define CHECKPLANESFLAG 0x00000004 -#define SHOWPCB_FLAG_DRC 0x00000008 -#define RUBBERBANDFLAG 0x00000010 -#define DESCRIPTIONFLAG 0x00000020 -#define NAMEONPCBFLAG 0x00000040 -#define AUTOPCB_FLAG_DRC 0x00000080 -#define ALLDIRECTIONFLAG 0x00000100 -#define SWAPSTARTDIRFLAG 0x00000200 -#define UNIQUENAMEFLAG 0x00000400 -#define CLEARNEWFLAG 0x00000800 -#define SNAPPCB_FLAG_PIN 0x00001000 -#define SHOWMASKFLAG 0x00002000 -#define THINDRAWFLAG 0x00004000 -#define ORTHOMOVEFLAG 0x00008000 -#define LIVEROUTEFLAG 0x00010000 -#define THINDRAWPOLYFLAG 0x00020000 -#define LOCKNAMESFLAG 0x00040000 -#define ONLYNAMESFLAG 0x00080000 -#define NEWPCB_FLAG_FULLPOLY 0x00100000 -#define HIDENAMESFLAG 0x00200000 -#define ENABLEPCB_FLAG_MINCUT 0x00400000 Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4884) +++ trunk/src_plugins/io_pcb/file.c (revision 4885) @@ -58,7 +58,7 @@ #include "rats_patch.h" #include "hid_actions.h" #include "hid_flags.h" -#include "flags.h" +#include "flag_str.h" #include "attribs.h" #include "route_style.h" #include "obj_poly.h" @@ -77,7 +77,7 @@ * Flag helper functions */ -#define F2S(OBJ, TYPE) flags_to_string ((OBJ)->Flags, TYPE) +#define F2S(OBJ, TYPE) pcb_strflg_f2s((OBJ)->Flags, TYPE) /* --------------------------------------------------------------------------- */ @@ -246,7 +246,7 @@ pcb_fprintf(FP, "Thermal[%s]\n", c_dtostr(PCB->ThermScale)); pcb_fprintf(FP, "DRC[%[0] %[0] %[0] %[0] %[0] %[0]]\n", PCB->Bloat, PCB->Shrink, PCB->minWid, PCB->minSlk, PCB->minDrill, PCB->minRing); - fprintf(FP, "Flags(%s)\n", pcbflags_to_string(pcb_flags)); + fprintf(FP, "Flags(%s)\n", pcb_strflg_board_f2s(pcb_flags)); fprintf(FP, "Groups(\"%s\")\n", LayerGroupsToString(&PCB->LayerGroups)); fputs("Styles[\"", FP); Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4884) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4885) @@ -2069,7 +2069,7 @@ case 42: #line 581 "parse_y.y" /* yacc.c:1646 */ { - yy_pcb_flags = string_to_pcbflags ((yyvsp[-1].string), yyerror); + yy_pcb_flags = pcb_strflg_board_s2f((yyvsp[-1].string), yyerror); free((yyvsp[-1].string)); } #line 2076 "parse_y.c" /* yacc.c:1646 */ @@ -2761,7 +2761,7 @@ case 163: #line 1710 "parse_y.y" /* yacc.c:1646 */ - { (yyval.flagtype) = string_to_flags ((yyvsp[0].string), yyerror); free((yyvsp[0].string)); } + { (yyval.flagtype) = pcb_strflg_s2f((yyvsp[0].string), yyerror); free((yyvsp[0].string)); } #line 2766 "parse_y.c" /* yacc.c:1646 */ break; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4884) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4885) @@ -579,7 +579,7 @@ } | T_FLAGS '(' STRING ')' { - yy_pcb_flags = string_to_pcbflags ($3, yyerror); + yy_pcb_flags = pcb_strflg_board_s2f($3, yyerror); free($3); } | @@ -1707,7 +1707,7 @@ ; flags : INTEGER { $$ = pcb_flag_old($1); } - | STRING { $$ = string_to_flags ($1, yyerror); free($1); } + | STRING { $$ = pcb_strflg_s2f($1, yyerror); free($1); } ; symbols Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 4884) +++ trunk/src_plugins/polycombine/polycombine.c (revision 4885) @@ -331,7 +331,7 @@ ENDALL_LOOP; /* Now de-construct the resulting polygon into raw PCB polygons */ - PolyToPolygonsOnLayer(PCB->Data, Layer, res, string_to_pcbflags("clearpoly", NULL)); + PolyToPolygonsOnLayer(PCB->Data, Layer, res, pcb_strflg_board_s2f("clearpoly", NULL)); RestoreUndoSerialNumber(); IncrementUndoSerialNumber(); pcb_draw(); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4884) +++ trunk/src_plugins/report/report.c (revision 4885) @@ -148,7 +148,7 @@ "(X,Y) = %$mD.\n" "It is a pure hole of diameter %$mS.\n" "Name = \"%s\"." - "%s", USER_UNITMASK, via->ID, flags_to_string(via->Flags, PCB_TYPE_VIA), + "%s", USER_UNITMASK, via->ID, pcb_strflg_f2s(via->Flags, PCB_TYPE_VIA), via->X, via->Y, via->DrillingHole, EMPTY(via->Name), PCB_FLAG_TEST(PCB_FLAG_LOCK, via) ? "It is LOCKED.\n" : ""); else report = pcb_strdup_printf("%m+VIA ID# %ld; Flags:%s\n" @@ -158,7 +158,7 @@ "Annulus = %$mS.\n" "Solder mask hole = %$mS (gap = %$mS).\n" "Name = \"%s\"." - "%s", USER_UNITMASK, via->ID, flags_to_string(via->Flags, PCB_TYPE_VIA), + "%s", USER_UNITMASK, via->ID, pcb_strflg_f2s(via->Flags, PCB_TYPE_VIA), via->X, via->Y, via->Thickness, via->DrillingHole, @@ -192,7 +192,7 @@ "(X,Y) = %$mD.\n" "It is a mounting hole. Drill width = %$mS.\n" "It is owned by element %$mS.\n" - "%s", USER_UNITMASK, Pin->ID, flags_to_string(Pin->Flags, PCB_TYPE_PIN), + "%s", USER_UNITMASK, Pin->ID, pcb_strflg_f2s(Pin->Flags, PCB_TYPE_PIN), Pin->X, Pin->Y, Pin->DrillingHole, EMPTY(element->Name[1].TextString), PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) ? "It is LOCKED.\n" : ""); else @@ -205,7 +205,7 @@ "Name = \"%s\".\n" "It is owned by element %s\n as pin number %s.\n" "%s", USER_UNITMASK, - Pin->ID, flags_to_string(Pin->Flags, PCB_TYPE_PIN), + Pin->ID, pcb_strflg_f2s(Pin->Flags, PCB_TYPE_PIN), Pin->X, Pin->Y, Pin->Thickness, Pin->DrillingHole, Pin->Clearance / 2, @@ -234,7 +234,7 @@ "It is on layer %d\n" "and has name \"%s\".\n" "%s", USER_UNITMASK, - line->ID, flags_to_string(line->Flags, PCB_TYPE_LINE), + line->ID, pcb_strflg_f2s(line->Flags, PCB_TYPE_LINE), line->Point1.X, line->Point1.Y, line->Point1.ID, line->Point2.X, line->Point2.Y, line->Point2.ID, line->Thickness, line->Clearance / 2, @@ -257,7 +257,7 @@ "connects to layer group %d.\n" "SecondPoint(X,Y) = %$mD; ID = %ld; " "connects to layer group %d.\n", - USER_UNITMASK, line->ID, flags_to_string(line->Flags, PCB_TYPE_LINE), + USER_UNITMASK, line->ID, pcb_strflg_f2s(line->Flags, PCB_TYPE_LINE), line->Point1.X, line->Point1.Y, line->Point1.ID, line->group1, line->Point2.X, line->Point2.Y, line->Point2.ID, line->group2); break; @@ -284,7 +284,7 @@ "Bounding Box is %$mD, %$mD.\n" "That makes the end points at %$mD and %$mD.\n" "It is on layer %d.\n" - "%s", USER_UNITMASK, Arc->ID, flags_to_string(Arc->Flags, PCB_TYPE_ARC), + "%s", USER_UNITMASK, Arc->ID, pcb_strflg_f2s(Arc->Flags, PCB_TYPE_ARC), Arc->X, Arc->Y, Arc->Width, Arc->Thickness, Arc->Clearance / 2, Arc->StartAngle, Arc->Delta, @@ -313,7 +313,7 @@ " without using more memory.\n" "It has %d holes and resides on layer %d.\n" "%s", USER_UNITMASK, Polygon->ID, - flags_to_string(Polygon->Flags, PCB_TYPE_POLYGON), + pcb_strflg_f2s(Polygon->Flags, PCB_TYPE_POLYGON), Polygon->BoundingBox.X1, Polygon->BoundingBox.Y1, Polygon->BoundingBox.X2, Polygon->BoundingBox.Y2, Polygon->PointN, Polygon->PointMax - Polygon->PointN, @@ -355,7 +355,7 @@ " as pin number %s and is on the %s\n" "side of the board.\n" "%s", USER_UNITMASK, Pad->ID, - flags_to_string(Pad->Flags, PCB_TYPE_PAD), + pcb_strflg_f2s(Pad->Flags, PCB_TYPE_PAD), Pad->Point1.X, Pad->Point1.Y, Pad->Point1.ID, Pad->Point2.X, Pad->Point2.Y, Pad->Point2.ID, Pad->Thickness, len + Pad->Thickness, @@ -388,7 +388,7 @@ "Mark located at point (X,Y) = %$mD.\n" "It is on the %s side of the board.\n" "%s", USER_UNITMASK, - element->ID, flags_to_string(element->Flags, PCB_TYPE_ELEMENT), + element->ID, pcb_strflg_f2s(element->Flags, PCB_TYPE_ELEMENT), element->BoundingBox.X1, element->BoundingBox.Y1, element->BoundingBox.X2, element->BoundingBox.Y2, EMPTY(element->Name[0].TextString), @@ -431,7 +431,7 @@ "Direction is %d.\n" "The bounding box is %$mD %$mD.\n" "%s\n" - "%s", USER_UNITMASK, text->ID, flags_to_string(text->Flags, PCB_TYPE_TEXT), + "%s", USER_UNITMASK, text->ID, pcb_strflg_f2s(text->Flags, PCB_TYPE_TEXT), text->X, text->Y, PCB_SCALE_TEXT(FONT_CAPHEIGHT, text->Scale), text->TextString, text->Direction, text->BoundingBox.X1, text->BoundingBox.Y1, Index: trunk/tests/strflags/tester.c =================================================================== --- trunk/tests/strflags/tester.c (revision 4884) +++ trunk/tests/strflags/tester.c (revision 4885) @@ -104,8 +104,8 @@ if (random() & 4) PCB_FLAG_THERM_ASSIGN(i, 3, &fh); - str = flags_to_string(fh.Flags, otype); - new_flags = string_to_flags(str, 0); + str = pcb_strflg_f2s(fh.Flags, otype); + new_flags = pcb_strflg_s2f(str, 0); count++; if (PCB_FLAG_EQ(fh.Flags, new_flags)) @@ -137,8 +137,8 @@ PCB_FLAG_SET(pcb_flagbits[i].mask, &fh); } - str = pcbflags_to_string(fh.Flags); - new_flags = string_to_pcbflags(str, 0); + str = pcb_strflg_board_f2s(fh.Flags); + new_flags = pcb_strflg_board_s2f(str, 0); count++; if (PCB_FLAG_EQ(fh.Flags, new_flags))