src/inc/gff3.h 1.3

Index: src/inc/gff3.h
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/inc/gff3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -B -U 4 -r1.2 -r1.3
--- src/inc/gff3.h	12 Aug 2009 07:48:05 -0000	1.2
+++ src/inc/gff3.h	25 May 2010 00:14:45 -0000	1.3
@@ -119,9 +119,9 @@
     struct slName *dbxrefs; /* database cross references. */
 
     struct slName *ontologyTerms; /* cross reference to ontology terms. */
 
-    struct gff3AttrVals *attrs;  /* attributes, both user-define and spec-defined,
+    struct gff3Attr *attrs;  /* attributes, both user-define and spec-defined,
                                   * parsed into one or more values */
 
     struct gff3AnnRef *children;  /* child nodes */
 
@@ -140,14 +140,14 @@
     struct gff3AnnRef *next;   /* next link in the chain */
     struct gff3Ann *ann;       /* reference to object */
 };
 
-struct gff3AttrVals
+struct gff3Attr
 /* an attribute and string values */
 {
-    struct gff3AttrVals *next;  /* next attribute in the list */
-    char *attr;                 /* name of attribute */
-    struct slName *vals;        /* value for the attribute */
+    struct gff3Attr *next;     /* next attribute in the list */
+    char *tag;                 /* name of attribute */
+    struct slName *vals;       /* values for the attribute */
 };
 
 struct gff3SeqRegion
 /* start/end of a sequence region, taken from ##sequence-region record.*/
@@ -189,9 +189,9 @@
     int errCnt;             /* error count */
 };
 
 
-/* standard attribute names */
+/* standard attribute tags */
 extern char *gff3AttrID;
 extern char *gff3AttrName;
 extern char *gff3AttrAlias;
 extern char *gff3AttrParent;
@@ -223,9 +223,9 @@
 
 struct gff3Ann *gff3FileFindAnn(struct gff3File *g3f, char *id);
 /* find an annotation record by id, or NULL if not found. */
 
-struct gff3AttrVals *gff3AnnFindAttr(struct gff3Ann *g3a, char *attr);
+struct gff3Attr *gff3AnnFindAttr(struct gff3Ann *g3a, char *tag);
 /* find a user attribute, or NULL */
 
 void gff3FileWrite(struct gff3File *g3f, char *fileName);
 /* write contents of an GFF3File object to a file */