Index: trunk/src/attrib.c =================================================================== --- trunk/src/attrib.c (revision 4778) +++ trunk/src/attrib.c (revision 4779) @@ -31,7 +31,7 @@ #include "compat_misc.h" #include "attrib.h" -char *AttributeGetFromList(AttributeListType * list, const char *name) +char *AttributeGetFromList(pcb_attribute_list_t * list, const char *name) { int i; for (i = 0; i < list->Number; i++) @@ -40,7 +40,7 @@ return NULL; } -int AttributePutToList(AttributeListType * list, const char *name, const char *value, int replace) +int AttributePutToList(pcb_attribute_list_t * list, const char *name, const char *value, int replace) { int i; @@ -59,7 +59,7 @@ list. See if there's room. */ if (list->Number >= list->Max) { list->Max += 10; - list->List = (AttributeType *) realloc(list->List, list->Max * sizeof(AttributeType)); + list->List = (pcb_attribute_t *) realloc(list->List, list->Max * sizeof(pcb_attribute_t)); } /* Now add the new attribute. */ @@ -70,7 +70,7 @@ return 0; } -int AttributeRemoveFromList(AttributeListType * list, const char *name) +int AttributeRemoveFromList(pcb_attribute_list_t * list, const char *name) { int i, j, found = 0; for (i = 0; i < list->Number; i++) @@ -88,7 +88,7 @@ /* --------------------------------------------------------------------------- * frees memory used by an attribute list */ -void FreeAttributeListMemory(AttributeListTypePtr list) +void FreeAttributeListMemory(pcb_attribute_list_t *list) { int i; Index: trunk/src/attrib.h =================================================================== --- trunk/src/attrib.h (revision 4778) +++ trunk/src/attrib.h (revision 4779) @@ -29,34 +29,34 @@ #ifndef PCB_ATTRIB_H #define PCB_ATTRIB_H -typedef struct AttributeListType AttributeListType, *AttributeListTypePtr; +typedef struct pcb_attribute_list_s pcb_attribute_list_t; -typedef struct { +typedef struct pcb_attribute_s { char *name; char *value; -} AttributeType, *AttributeTypePtr; +} pcb_attribute_t; -struct AttributeListType { +struct pcb_attribute_list_s { int Number, Max; - AttributeType *List; + pcb_attribute_t *List; }; /* Returns NULL if the name isn't found, else the value for that named attribute. */ -char *AttributeGetFromList(AttributeListType * list, const char *name); +char *AttributeGetFromList(pcb_attribute_list_t * list, const char *name); /* Adds an attribute to the list. If the attribute already exists, whether it's replaced or a second copy added depends on REPLACE. Returns non-zero if an existing attribute was replaced. */ -int AttributePutToList(AttributeListType * list, const char *name, const char *value, int replace); +int AttributePutToList(pcb_attribute_list_t * list, const char *name, const char *value, int replace); /* Simplistic version: Takes a pointer to an object, looks up attributes in it. */ #define AttributeGet(OBJ,name) AttributeGetFromList (&(OBJ->Attributes), name) /* Simplistic version: Takes a pointer to an object, sets attributes in it. */ #define AttributePut(OBJ,name,value) AttributePutToList (&(OBJ->Attributes), name, value, 1) /* Remove an attribute by name; returns number of items removed */ -int AttributeRemoveFromList(AttributeListType * list, const char *name); +int AttributeRemoveFromList(pcb_attribute_list_t * list, const char *name); /* Simplistic version of Remove. */ #define AttributeRemove(OBJ, name) AttributeRemoveFromList (&(OBJ->Attributes), name) -void FreeAttributeListMemory(AttributeListTypePtr list); +void FreeAttributeListMemory(pcb_attribute_list_t *list); #endif Index: trunk/src/board.h =================================================================== --- trunk/src/board.h (revision 4778) +++ trunk/src/board.h (revision 4779) @@ -99,7 +99,7 @@ vtroutestyle_t RouteStyle; LibraryType NetlistLib[NUM_NETLISTS]; pcb_ratspatch_line_t *NetlistPatches, *NetlistPatchLast; - AttributeListType Attributes; + pcb_attribute_list_t Attributes; pcb_data_t *Data; /* entire database */ pcb_bool is_footprint; /* If set, the user has loaded a footprint, not a pcb. */ Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 4778) +++ trunk/src/hid.h (revision 4779) @@ -446,7 +446,7 @@ HID_DRC_GUI *drc_gui; - void (*edit_attributes) (const char *owner, AttributeListType * attrlist_); + void (*edit_attributes) (const char *owner, pcb_attribute_list_t * attrlist_); /* Debug drawing support. These APIs must be implemented (non NULL), * but they do not have to be functional. request_debug_draw can Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 4778) +++ trunk/src/layer.h (revision 4779) @@ -52,7 +52,7 @@ pcb_bool On; /* visible flag */ const char *Color; /* color */ const char *SelectedColor; - AttributeListType Attributes; + pcb_attribute_list_t Attributes; int no_drc; /* whether to ignore the layer when checking the design rules */ }; Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 4778) +++ trunk/src/obj_common.h (revision 4779) @@ -78,7 +78,7 @@ pcb_box_t BoundingBox; \ long int ID; \ FlagType Flags; \ - AttributeListType Attributes + pcb_attribute_list_t Attributes /* struct LibraryEntryType *net */ Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4778) +++ trunk/src/object_act.c (revision 4779) @@ -65,7 +65,7 @@ return NULL; } -static AttributeType *lookup_attr(AttributeListTypePtr list, const char *name) +static pcb_attribute_t *lookup_attr(pcb_attribute_list_t *list, const char *name) { int i; for (i = 0; i < list->Number; i++) @@ -74,13 +74,13 @@ return NULL; } -static void delete_attr(AttributeListTypePtr list, AttributeType * attr) +static void delete_attr(pcb_attribute_list_t *list, pcb_attribute_t * attr) { int idx = attr - list->List; if (idx < 0 || idx >= list->Number) return; if (list->Number - idx > 1) - memmove(attr, attr + 1, (list->Number - idx - 1) * sizeof(AttributeType)); + memmove(attr, attr + 1, (list->Number - idx - 1) * sizeof(pcb_attribute_t)); list->Number--; } @@ -658,7 +658,7 @@ { pcb_element_t *e = NULL; const char *refdes, *name, *value; - AttributeType *attr; + pcb_attribute_t *attr; if (argc < 2) { AFAIL(elementsetattr); Index: trunk/src_plugins/hid_gtk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4778) +++ trunk/src_plugins/hid_gtk/gtkhid-main.c (revision 4779) @@ -818,7 +818,7 @@ static AttrRow *attr_row = 0; static int attr_num_rows = 0; static int attr_max_rows = 0; -static AttributeListType *attributes_list; +static pcb_attribute_list_t *attributes_list; static GtkWidget *attributes_dialog, *attr_table; static void attributes_delete_callback(GtkWidget * w, void *v); @@ -912,7 +912,7 @@ ghid_attr_set_table_size(); } -static void ghid_attributes(const char *owner, AttributeListType * attrs) +static void ghid_attributes(const char *owner, pcb_attribute_list_t * attrs) { GtkWidget *content_area; int response; @@ -954,11 +954,11 @@ free(attributes_list->List[i].value); } if (attributes_list->Max < attr_num_rows) { - int sz = attr_num_rows * sizeof(AttributeType); + int sz = attr_num_rows * sizeof(pcb_attribute_t); if (attributes_list->List == NULL) - attributes_list->List = (AttributeType *) malloc(sz); + attributes_list->List = (pcb_attribute_t *) malloc(sz); else - attributes_list->List = (AttributeType *) realloc(attributes_list->List, sz); + attributes_list->List = (pcb_attribute_t *) realloc(attributes_list->List, sz); attributes_list->Max = attr_num_rows; } for (i = 0; i < attr_num_rows; i++) { Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 4778) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 4779) @@ -1519,7 +1519,7 @@ static int attr_num_rows = 0; static int attr_max_rows = 0; static Widget attr_dialog = NULL, f_top; -static AttributeListType *attributes_list; +static pcb_attribute_list_t *attributes_list; static void attributes_delete_callback(Widget w, void *v, void *cbs); @@ -1714,7 +1714,7 @@ lesstif_attributes_revert(); } -void lesstif_attributes_dialog(const char *owner, AttributeListType * attrs_list) +void lesstif_attributes_dialog(const char *owner, pcb_attribute_list_t * attrs_list) { Widget bform, sw, b_ok, b_cancel, b_revert, b_new; Widget sep; @@ -1801,11 +1801,11 @@ free(attributes_list->List[i].value); } if (attributes_list->Max < attr_num_rows) { - int sz = attr_num_rows * sizeof(AttributeType); + int sz = attr_num_rows * sizeof(pcb_attribute_t); if (attributes_list->List == NULL) - attributes_list->List = (AttributeType *) malloc(sz); + attributes_list->List = (pcb_attribute_t *) malloc(sz); else - attributes_list->List = (AttributeType *) realloc(attributes_list->List, sz); + attributes_list->List = (pcb_attribute_t *) realloc(attributes_list->List, sz); attributes_list->Max = attr_num_rows; } for (i = 0; i < attr_num_rows; i++) { Index: trunk/src_plugins/hid_lesstif/lesstif.h =================================================================== --- trunk/src_plugins/hid_lesstif/lesstif.h (revision 4778) +++ trunk/src_plugins/hid_lesstif/lesstif.h (revision 4779) @@ -58,7 +58,7 @@ extern char *lesstif_prompt_for(const char *, const char *); extern char *lesstif_fileselect(const char *, const char *, const char *, const char *, const char *, int); extern void lesstif_log(const char *fmt, ...); -extern void lesstif_attributes_dialog(const char *, AttributeListType *); +extern void lesstif_attributes_dialog(const char *, pcb_attribute_list_t *); #ifndef XtRPCBCoord #define XtRPCBCoord "PCBCoord" Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4778) +++ trunk/src_plugins/io_lihata/read.c (revision 4779) @@ -54,7 +54,7 @@ objects during the load. */ #define post_id_req(obj) vtptr_append(&post_ids, &((obj)->ID)) -static int parse_attributes(AttributeListType *list, lht_node_t *nd) +static int parse_attributes(pcb_attribute_list_t *list, lht_node_t *nd) { lht_node_t *n; lht_dom_iterator_t it; Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4778) +++ trunk/src_plugins/io_lihata/write.c (revision 4779) @@ -132,7 +132,7 @@ return meta; } -static lht_node_t *build_attributes(AttributeListType *lst) +static lht_node_t *build_attributes(pcb_attribute_list_t *lst) { int n; lht_node_t *ln; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4778) +++ trunk/src_plugins/io_pcb/file.c (revision 4779) @@ -147,7 +147,7 @@ /* --------------------------------------------------------------------------- * writes out an attribute list */ -static void WriteAttributeList(FILE * FP, AttributeListTypePtr list, const char *prefix) +static void WriteAttributeList(FILE * FP, pcb_attribute_list_t *list, const char *prefix) { int i; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4778) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4779) @@ -139,7 +139,7 @@ static char *layer_group_string; -static AttributeListTypePtr attr_list; +static pcb_attribute_list_t *attr_list; int yyerror(const char *s); int yylex(); Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4778) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4779) @@ -76,7 +76,7 @@ static char *layer_group_string; -static AttributeListTypePtr attr_list; +static pcb_attribute_list_t *attr_list; int yyerror(const char *s); int yylex(); Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 4778) +++ trunk/src_plugins/propedit/propsel.c (revision 4779) @@ -57,7 +57,7 @@ pcb_props_add(((map_ctx_t *)ctx)->props, name, type2TYPE_ ## type, v); \ } while(0) -static void map_attr(void *ctx, const AttributeListType *list) +static void map_attr(void *ctx, const pcb_attribute_list_t *list) { int i, bl = 0; char small[256]; @@ -199,7 +199,7 @@ int set_cnt; } set_ctx_t; -static void set_attr(set_ctx_t *st, AttributeListType *list) +static void set_attr(set_ctx_t *st, pcb_attribute_list_t *list) { const char *key = st->name+2; const char *orig = AttributeGetFromList(list, key); @@ -479,7 +479,7 @@ int del_cnt; } del_ctx_t; -static void del_attr(void *ctx, AttributeListType *list) +static void del_attr(void *ctx, pcb_attribute_list_t *list) { del_ctx_t *st = (del_ctx_t *)ctx; if (AttributeRemoveFromList(list, st->key+2))