Update attribute_reader

Author: timeout

include/html_parser_attribute_reader.h

@@ -8,7 +8,7 @@ extern "C" {
 #include "html_parser_text.h"
 #include "html_parser_attribute_list.h"
 
-extern Attr_list_T attribute_reader(Text_T *tag);
+extern Attr_list_T Attribute_reader(Text_T *tag_chunk);
 
 #ifdef __cplusplus
 }

src/html_parser_attribute_reader.c

@@ -6,30 +6,30 @@
 
 /* static function prototypes */
 static Text_T strip(Text_T *txt);
-static Attr_rep_T attribute(Text_T *tag);
-static char *attribute_name(Text_T *tag);
-static char *attribute_value(Text_T *tag);
+static Attr_rep_T attribute(Text_T *tag_chunk);
+static char *attribute_name(Text_T *tag_chunk);
+static char *attribute_value(Text_T *tag_chunk);
 
-Attr_list_T attribute_reader(Text_T *tag)
+Attr_list_T Attribute_reader(Text_T *tag_chunk)
 {
 	Attr_list_T attr_list;
 
 	Fmt_register('T', Text_fmt);
 
 	attr_list = Attr_list_list();
-	while (tag->len > 0) 
-		attr_list = Attr_list_enqueue(attr_list, attribute(tag));
+	while (tag_chunk->len > 0) 
+		attr_list = Attr_list_enqueue(attr_list, attribute(tag_chunk));
 
 	return attr_list;
 }
 
-static Attr_rep_T attribute(Text_T *tag)
+static Attr_rep_T attribute(Text_T *tag_chunk)
 {
 	char *name, *value;
 	Attr_rep_T new;
 
-	name = attribute_name(tag);
-	value = attribute_value(tag);
+	name = attribute_name(tag_chunk);
+	value = attribute_value(tag_chunk);
 
 	new =Attr_rep_new(name, value);
 
@@ -39,44 +39,45 @@ static Attr_rep_T attribute(Text_T *tag)
 	return new;
 }
 
-static char *attribute_name(Text_T *tag)
+static char *attribute_name(Text_T *tag_chunk)
 {
 	int end;
 	Text_T name;
 
-	end = Text_chr(*tag, 1, 0, '=');
-	name = Text_sub(*tag, 1, end);
+	end = Text_chr(*tag_chunk, 1, 0, '=');
+	name = Text_sub(*tag_chunk, 1, end);
 
 	strip(&name);
 
-	/* progress tag */
-	*tag = Text_sub(*tag, end + 1, 0);
+	/* progress tag_chunk */
+	*tag_chunk = Text_sub(*tag_chunk, end + 1, 0);
 
 	return Text_get(NULL, -1, name);
 }
 
-static char *attribute_value(Text_T *tag)
+static char *attribute_value(Text_T *tag_chunk)
 {
 	int start, end;
 	Text_T value;
 
-	start = Text_upto(*tag, 1, 0, Text_nonwhite);
+	start = Text_upto(*tag_chunk, 1, 0, Text_nonwhite);
 
 	/* Is the value enclosed by quotes? */
-	if (Text_chr(*tag, start, start + 1, '"')) {
+	if (Text_chr(*tag_chunk, start, start + 1, '"')) {
 		start++;
-		end = Text_chr(*tag, start + 1, 0, '"');
+		end = Text_chr(*tag_chunk, start + 1, 0, '"');
 	} else {
-		end = Text_chr(*tag, start, 0, ' ');
+		end = Text_chr(*tag_chunk, start, 0, ' ');
 	}
 
-	value = Text_sub(*tag, start, end);
+	value = Text_sub(*tag_chunk, start, end);
 
-	/* progress tag */
+	/* progress tag_chunk */
 	if (end == 0) 
-		*tag = Text_sub(*tag, 0, 0);
+		*tag_chunk = Text_sub(*tag_chunk, 0, 0);
 	else
-		*tag = Text_sub(*tag, Text_upto(*tag, end + 1, 0, Text_nonwhite), 0);
+		*tag_chunk = Text_sub(*tag_chunk, Text_upto(*tag_chunk, end + 1, 0, 
+					Text_nonwhite), 0);
 
 	return Text_get(NULL, -1, value);
 }

tests/html_parser_attribute_reader_test.c

@@ -50,7 +50,7 @@ static int Test_attribute_list_reader(T t, void *s, const void *chk)
 		Attr_list_T head = Attr_list_list();
 		Text_T tmp = Text_put(attrs[i]);
 
-		head = attribute_reader(&tmp);
+		head = Attribute_reader(&tmp);
 
 		lr = (char *) Attr_list_print(head);