From MAILER-DAEMON Sun Apr 29 09:11:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hi9Bs-0001hB-4G
	for mharc-getht-commit@gnu.org; Sun, 29 Apr 2007 09:11:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hi9Bq-0001gi-9B
	for getht-commit@nongnu.org; Sun, 29 Apr 2007 09:11:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hi9Bo-0001fy-06
	for getht-commit@nongnu.org; Sun, 29 Apr 2007 09:11:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hi9Bn-0001fn-LA
	for getht-commit@nongnu.org; Sun, 29 Apr 2007 09:11:43 -0400
Received: from outmail136067.authsmtp.co.uk ([62.13.136.67])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <nick@njw.me.uk>) id 1Hi95h-0001RY-IC
	for getht-commit@nongnu.org; Sun, 29 Apr 2007 09:05:26 -0400
Received: from outmail128185.authsmtp.co.uk (outmail128185.authsmtp.co.uk
	[62.13.128.185])
	by punt2.authsmtp.com (8.13.8/8.13.8/Kp) with ESMTP id l3TD5NV0080745
	for <getht-commit@nongnu.org>; Sun, 29 Apr 2007 14:05:23 +0100 (BST)
Received: from localhost ([194.80.176.253]) (authenticated bits=0)
	by mail.authsmtp.com (8.13.8/8.13.8/Kp) with ESMTP id l3TD5GS6081606
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <getht-commit@nongnu.org>; Sun, 29 Apr 2007 14:05:16 +0100 (BST)
Date: Sun, 29 Apr 2007 14:08:20 +0100
From: Nick <nick@njw.me.uk>
To: getht-commit@nongnu.org
Message-ID: <20070429130820.GA6779@cutie1.lan>
Mail-Followup-To: getht-commit@nongnu.org
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="a8Wt8u1KmwUX3Y2C"
Content-Disposition: inline
User-Agent: Mutt/1.5.13 (2006-08-11)
X-Server-Quench: 46af59be-f652-11db-a443-001185d377ca
X-AuthRoute: OCdxYQ8WA1ZTTQ8Z IiUGE2lFREM4JQtD DAMDMU5RJ18MVBh5
	NEFcIVxOdloGSkcD Cnl6GxZLUl1xXnN0 bwBRaA9cZQRPVgF0
	WEhXQ1VUCgdtAgMF ABsBU1cudGEyfQkT Y0ZqX3ZbWgp7fUN7
	QwBQEzxQYG4yPX1J VkVaagJVJFFXLxtB aU1/VHIMaWBTZX1n
	FAYlNio6PX1ULyFQ Qx1fZV0fXUYXW3s5 ThEEGTQpEAhAH2Nq
	alk+I0IXHANLay0w 
X-Authentic-SMTP: 61633231373330.squirrel.dmpriest.net.uk:646/Kp
X-Report-SPAM: If SPAM / abuse - report it at: http://www.authsmtp.com/abuse
X-Virus-Status: No virus detected - but ensure you scan with your own
	anti-virus system!
X-detected-kernel: FreeBSD 6.x (1)
Subject: [Getht-commit] arch commit: getht--mainline--0.1--patch-21
X-BeenThere: getht-commit@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: getht-general@nongnu.org
List-Id: Repository Commit List <getht-commit.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/getht-commit>,
	<mailto:getht-commit-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/getht-commit>
List-Post: <mailto:getht-commit@nongnu.org>
List-Help: <mailto:getht-commit-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/getht-commit>,
	<mailto:getht-commit-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2007 13:11:46 -0000


--a8Wt8u1KmwUX3Y2C
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Revision: getht--mainline--0.1--patch-21
Archive: getht@sv.gnu.org
Creator: Nick White <arch@njw.me.uk>
Date: Sun Apr 29 14:07:45 BST 2007
Standard-date: 2007-04-29 13:07:45 GMT
New-files: .arch-ids/issuemem.c.id issuemem.c
Modified-files: Makefile download.c getht.c issue.h mediaxml.c
    tocxml.c
New-patches: getht@sv.gnu.org/getht--mainline--0.1--patch-21
Summary: Completed issue malloc, fixed build warnings
Keywords:=20

Used malloc to dynamically assign enough memory for sections,
items, and media, using the functionality of issuemem.c

Included some function definitions in issue.h to remove
various build warnings
A  .arch-ids/issuemem.c.id
A  issuemem.c
M  Makefile
M  download.c
M  getht.c
M  issue.h
M  mediaxml.c
M  tocxml.c

* modified files

--- orig/Makefile
+++ mod/Makefile
@@ -5,7 +5,7 @@
=20
 all: getht
=20
-getht: download.o config.o tocxml.o mediarev.o mediaxml.o xml.o
+getht: download.o config.o issuemem.o tocxml.o mediarev.o mediaxml.o xml.o
=20
 tocxml.o mediaxml.o: xml.o
=20


--- orig/download.c
+++ mod/download.c
@@ -162,10 +162,10 @@
 		}
=20
 	int count;
-	for(cur_section =3D issue->section, count =3D 0;
-			count <=3D issue->no_of_sections;
-			cur_section++, count++)
+	for(count =3D 0; count <=3D issue->no_of_sections; count++)
 	{
+		cur_section =3D issue->section[count];
+
 		snprintf(filename,STR_MAX,"%s/section_%i.pdf", newdir, cur_section->numb=
er);
 		if(!force){
 			testfile =3D fopen(filename, "r");


--- orig/getht.c
+++ mod/getht.c
@@ -208,9 +208,6 @@
 			}
 		}
=20
-		if(showstr)
-			show_iss_struct(issue, no_of_issues);
-
 		if(latest_index =3D=3D -1)
 		{
 			fprintf(stderr, "Error: Cannot ascertain latest issue. ");
@@ -228,9 +225,8 @@
 			downloadissue(NULL, save_path, issue[latest_index], force);
 	}
 =09
-	if(downmedia)
+	if(downmedia || showstr)
 	{
-		med * cur_media;
 		int newest;
=20
 		issue =3D parsemedia(media_xml, issue, &no_of_issues);
@@ -255,7 +251,7 @@
 		{
 			newest =3D findnewestiss(issue, no_of_issues);
 			for(i =3D 0; i <=3D issue[newest]->no_of_media; i++)
-				downloadmedia(NULL, save_path, &(issue[newest]->media[i]), force);
+				downloadmedia(NULL, save_path, issue[newest]->media[i], force);
 		}
=20
 		if(downallmedia)
@@ -263,17 +259,13 @@
 			for(i =3D 0; i <=3D no_of_issues; i++)
 			{
 				for(newest =3D 0; newest <=3D issue[i]->no_of_media; newest++)
-					downloadmedia(NULL, save_path, &(issue[i]->media[newest]), force);
+					downloadmedia(NULL, save_path, issue[i]->media[newest], force);
 			}
 		}
 	}
=20
-	if(no_of_issues > -1)
-	{
-		for(i =3D 0; i < no_of_issues; i++)
-			free(issue[i]);
-		free(issue);
-	}
+	if(showstr)
+		show_iss_struct(issue, no_of_issues);
=20
 	/* Ensure curl cleans itself up */
 	curl_easy_cleanup(main_curl_handle);
@@ -331,7 +323,7 @@
 void show_iss_struct(iss ** issue, int no_of_issues)
 /*	Prints issue information */
 {
-	int iss_no, sec_no, it_no;
+	int iss_no, sec_no, med_no, it_no;
 	printf("%i Issues\n",no_of_issues);
 	for(iss_no=3D0;iss_no<no_of_issues;iss_no++)
 	{
@@ -345,20 +337,32 @@
 		for(sec_no=3D0; sec_no <=3D (issue[iss_no]->no_of_sections); sec_no++)
 		{
 			printf("\t-Section %i-\n", (sec_no));
-			printf("\tTitle:\t'%s'\n", issue[iss_no]->section[sec_no].title);
-			printf("\tURI:\t'%s'\n", issue[iss_no]->section[sec_no].uri);
-			printf("\tNo. of Items:\t'%i'\n", issue[iss_no]->section[sec_no].no_of_=
items);
+			printf("\tTitle:\t'%s'\n", issue[iss_no]->section[sec_no]->title);
+			printf("\tURI:\t'%s'\n", issue[iss_no]->section[sec_no]->uri);
+			printf("\tNo. of Items:\t'%i'\n", issue[iss_no]->section[sec_no]->no_of=
_items);
=20
-			for(it_no=3D0; it_no < issue[iss_no]->section[sec_no].no_of_items; it_n=
o++)
+			for(it_no=3D0; it_no <=3D issue[iss_no]->section[sec_no]->no_of_items; =
it_no++)
 			{
 				printf("\t\t-Item-\n");
-				printf("\t\tTitle:\t'%s'\n",issue[iss_no]->section[sec_no].item[it_no]=
=2Etitle);
-				printf("\t\tFirst page:\t'%i'",issue[iss_no]->section[sec_no].item[it_=
no].firstpage);
-				printf("\tLast page:\t'%i'\n",issue[iss_no]->section[sec_no].item[it_n=
o].lastpage);
+				printf("\t\tTitle:\t'%s'\n",issue[iss_no]->section[sec_no]->item[it_no=
]->title);
+				printf("\t\tFirst page:\t'%i'",issue[iss_no]->section[sec_no]->item[it=
_no]->firstpage);
+				printf("\tLast page:\t'%i'\n",issue[iss_no]->section[sec_no]->item[it_=
no]->lastpage);
 			}
 			it_no =3D 0;
 		}
 		sec_no =3D 0;
+
+		printf("Number of Media:\t'%i'\n",issue[iss_no]->no_of_media);
+
+		for(med_no=3D0; med_no <=3D (issue[iss_no]->no_of_media); med_no++)
+		{
+			printf("\t-Media %i-\n", (med_no));
+			printf("\tTitle:\t'%s'\n", issue[iss_no]->media[med_no]->title);
+			printf("\tURI:\t'%s'\n", issue[iss_no]->media[med_no]->uri);
+			printf("\tComment:\t'%s'\n", issue[iss_no]->media[med_no]->comment);
+			printf("\tPreview URI:\t'%s'\n", issue[iss_no]->media[med_no]->preview_=
uri);
+		}
+		med_no =3D 0;
 	}
 }
=20
@@ -389,24 +393,22 @@
 		cur_issue->preview_uri[0] =3D '\0';
 		cur_issue->title[0] =3D '\0';
 		cur_issue->size =3D 0;
-		cur_issue->no_of_sections =3D 0;
-		cur_issue->no_of_media =3D 0;
-		clearmed(cur_issue->media);
+		cur_issue->no_of_sections =3D -1;
+		cur_issue->section =3D NULL;
+		cur_issue->no_of_media =3D -1;
+		cur_issue->media =3D NULL;
+		//clearmed(cur_issue->media);
 	}
 }
=20
 void clearmed(med * cur_media)
-/*	clears all members of media arrays */
+/*	clears the members of a media array */
 {
-	int tmp;
-	for(tmp=3D0; tmp<=3DMED_NO; cur_media++,tmp++)
-	{
-		cur_media->uri[0] =3D '\0';
-		cur_media->title[0] =3D '\0';
-		cur_media->comment[0] =3D '\0';
-		cur_media->preview_uri[0] =3D '\0';
-		cur_media->size =3D 0;
-	}
+	cur_media->uri[0] =3D '\0';
+	cur_media->title[0] =3D '\0';
+	cur_media->comment[0] =3D '\0';
+	cur_media->preview_uri[0] =3D '\0';
+	cur_media->size =3D 0;
 }
=20
 void clearsec(sec * cur_section)


--- orig/issue.h
+++ mod/issue.h
@@ -45,7 +45,7 @@
 	char title[512];
 	int number;
 	int size;
-	it item[ITEM_NO];
+	it ** item;
 	int no_of_items;
 } sec;
=20
@@ -64,8 +64,15 @@
 	char title[512];
 	int size;
 	issdates date;
-	sec section[SEC_NO];
+	sec ** section;
 	int no_of_sections;
-	med media[MED_NO];
+	med ** media;
 	int no_of_media;
 } iss;
+
+iss ** parsetoc(char *filepath, int * iss_no, int * latest);
+iss ** parsemedia(char * filepath, iss ** issue, int * no_of_issues);
+
+iss ** assignnew_iss(int *no_of_issues, iss ** issue);
+sec ** assignnew_sec(int *no_of_sections, sec ** section);
+it ** assignnew_it(int * no_of_items, it ** item);


--- orig/mediaxml.c
+++ mod/mediaxml.c
@@ -165,7 +165,7 @@
=20
 			if(!issue_there)
 			{	/* advance to the next free issue */
-				iss ** tmpiss;
+				iss ** tmpiss =3D NULL;
 				if(*no_of_issues =3D=3D -1)
 				{	/* make issue** a new array of issue pointers */
 					if( (tmpiss =3D malloc(sizeof(iss *))) =3D=3D NULL )
@@ -194,9 +194,11 @@
 				tmp =3D *no_of_issues;
 			}
=20
+			iss * cur_issue =3D issue[tmp];
+
 			issue[tmp]->no_of_media =3D -1;
-			cur_media =3D issue[tmp]->media;
=20
+			med ** tmpmed =3D NULL;
=20
 			itnode =3D node->xmlChildrenNode;
=20
@@ -205,6 +207,31 @@
=20
 				if(!xmlStrcmp(itnode->name,(char *) "item"))
 				{
+					/* assign memory for new media */
+					if(cur_issue->no_of_media < 0)
+					{       /* make **section a new array of section pointers */
+						if( (tmpmed =3D malloc(sizeof(med *))) =3D=3D NULL )
+						nogo_mem();
+					}
+					else
+					{       /* add a new pointer to media pointer list */
+						if( (tmpmed =3D realloc(cur_issue->media, sizeof(med *) + ((cur_issu=
e->no_of_media+1) * sizeof(med *)))) =3D=3D NULL )
+						nogo_mem();
+					}
+
+					cur_issue->no_of_media++;
+
+					/* make new array item a pointer to issue */
+					if( (tmpmed[cur_issue->no_of_media] =3D malloc(sizeof(med))) =3D=3D N=
ULL )
+						nogo_mem();
+
+					cur_issue->media =3D tmpmed;
+					/* memory for seoction all dealt with */
+
+					cur_media =3D cur_issue->media[cur_issue->no_of_media];
+				=09
+					clearmed(cur_media);
+
 					/* add media info to cur_media */
 					if(xmlGetProp(itnode, "uri"))
 						strncpy(cur_media->uri, (char *) xmlGetProp(itnode, "uri"), STR_MAX);
@@ -216,10 +243,6 @@
 						strncpy(cur_media->preview_uri, (char *) xmlGetProp(itnode, "preview=
_uri"), STR_MAX);
=20
 					strncpy(cur_media->title, (char *) xmlNodeListGetString(media_file, i=
tnode->xmlChildrenNode, 1), STR_MAX);
-
-					issue[tmp]->no_of_media++;
-
-					cur_media++;
 				}
 			=09
 				itnode =3D itnode->next;


--- orig/tocxml.c
+++ mod/tocxml.c
@@ -29,7 +29,6 @@
 #include "getht.h"
=20
 iss ** parsetoc(char *filepath, int * iss_no, int * latest);
-iss ** parseyear(xmlDocPtr file, xmlNodePtr node, iss ** issue, int * late=
st);
 int parseissue(xmlDocPtr file, xmlNodePtr node, iss * cur_issue, int * lat=
est);
 void parsesection(xmlDocPtr file, xmlNodePtr node, sec * cur_section);
=20
@@ -37,17 +36,8 @@
=20
 int no_of_issues;
=20
-void nogo_mem()
-/*	called if memory assignation fails
-	TODO: handle freeing of memory to avoid leaks */
-{
-	fprintf(stderr, "Could not assign memory, exitting\n");
-	exit(1);
-}
-
 iss ** parsetoc(char *filepath, int * iss_no, int * latest)
-/*	starts parsing of xml to issue structure
-	TODO: combine with parseyear */
+/*	starts parsing of xml to issue structure	*/
 {
 	xmlDocPtr file;
 	xmlNodePtr node;
@@ -59,10 +49,10 @@
=20
 	no_of_issues =3D -1;
=20
-	iss ** issue;
+	iss ** issue =3D NULL;
+	//iss ** tmp =3D NULL;
=20
 	int year;
-	iss ** tmp;
=20
 	xmlNodePtr cnode;
=20
@@ -75,29 +65,21 @@
 			{
     				if(!xmlStrncmp(cnode->name,(char *) "issue",5))
 				{
-					if(no_of_issues < 0)
-					{	/* make issue** a new array of issue pointers */
-						if( (tmp =3D malloc(sizeof(iss *))) =3D=3D NULL )
-							nogo_mem();
-					}
-					else
-					{	/* add a new pointer to issue pointer list */
-						if( (tmp =3D realloc(issue, sizeof(iss *) + ((no_of_issues+1) * size=
of(iss *)))) =3D=3D NULL )
-							nogo_mem();
-					}
-
-					no_of_issues++;
-
-					/* make new array item a pointer to issue */
-					if( (tmp[no_of_issues] =3D malloc(sizeof(iss))) =3D=3D NULL )
-						nogo_mem();
-
-					issue =3D tmp;
-
-					issue[no_of_issues]->no_of_media =3D -1; /* set default no of media */
-					issue[no_of_issues]->date.year =3D atoi( (const char *)(xmlStrsub(nod=
e->name,5,4)) );
-					tokenise_hyphons(xmlStrsub(cnode->name,6,5), &(issue[no_of_issues]->d=
ate.firstmonth), &(issue[no_of_issues]->date.lastmonth));
-					issue[no_of_issues]->no_of_sections =3D parseissue(file, cnode, issue=
[no_of_issues], latest);
+					/* assign memory for the new issue */
+					issue =3D assignnew_iss(&no_of_issues, issue);
+
+					/* setup issue globals */
+					issue[no_of_issues]->no_of_media =3D -1;
+					issue[no_of_issues]->no_of_sections =3D -1;
+					issue[no_of_issues]->date.year =3D
+						atoi( (const char *)(xmlStrsub(node->name,5,4)) );
+					tokenise_hyphons(
+							xmlStrsub(cnode->name,6,5),
+							&(issue[no_of_issues]->date.firstmonth),
+							&(issue[no_of_issues]->date.lastmonth));
+
+					/* parse the issue */
+					parseissue(file, cnode, issue[no_of_issues], latest);
 				}
 				cnode =3D cnode->next;
 			}
@@ -113,39 +95,40 @@
 }
=20
 int parseissue(xmlDocPtr file, xmlNodePtr node, iss * cur_issue, int * lat=
est)
-/*	parses issue from xml, saving in cur_issue structure */
+/*	parses issue from xml, saving in cur_issue structure	*/
 {
-	int no_of_sections =3D -1;
-
 	strncpy(cur_issue->title, (char *) xmlGetProp(node, "title"), STR_MAX);
 	strncpy(cur_issue->preview_uri, (char *) xmlGetProp(node, "coverlink"), S=
TR_MAX);
=20
 	if(xmlGetProp(node, "current") && *latest=3D=3D-1)
 		*latest =3D no_of_issues;
=20
-	sec * cur_section =3D NULL;
-
 	node =3D node->xmlChildrenNode;
=20
 	while(node !=3D NULL){
 		if(!xmlStrncmp(node->name, (char *) "section",7) ||
 			!xmlStrcmp(node->name, (const xmlChar *) "cover"))
 		{
-			no_of_sections++;
-			cur_section =3D &(cur_issue->section[no_of_sections]);
+			/* assign memory for new section */
+			cur_issue->section =3D=20
+				assignnew_sec(&(cur_issue->no_of_sections), cur_issue->section);
=20
-			parsesection(file, node, cur_section);
+			/* setup section globals */
+			cur_issue->section[cur_issue->no_of_sections]->no_of_items =3D -1;
+
+			/* parse the section */
+			parsesection(file, node, cur_issue->section[cur_issue->no_of_sections]);
 		}
 		node =3D node->next;
 	}
=20
-	return no_of_sections;
+	return 0;
 }
=20
 void parsesection(xmlDocPtr file, xmlNodePtr node, sec * cur_section)
 /*	parses section xml, filling cur_section structure */
 {
-	it * cur_item;
+	it * cur_item =3D NULL;
=20
 	strncpy(cur_section->uri, (char *) xmlGetProp(node, "pdflink"), STR_MAX);
 	strncpy(cur_section->title, (char *) xmlGetProp(node, "title"), STR_MAX);
@@ -155,31 +138,38 @@
 	else
 		cur_section->number =3D atoi( (const char *)(xmlStrsub(node->name,8,1)) =
);
=20
-	cur_item =3D cur_section->item;
-	cur_section->no_of_items =3D 0;
-
 	node =3D node->xmlChildrenNode;
=20
 	char * pagenums;
=20
+	it ** tmp =3D NULL;
+
 	while(node !=3D NULL)
 	{
 		if(!xmlStrcmp(node->name, (const xmlChar *) "item"))
 		{
-			cur_section->no_of_items++;
-			cur_item->title =3D xmlNodeListGetString(file, node->xmlChildrenNode, 1=
);
-			if(pagenums =3D (char *) xmlGetProp(node, "pages"))
-				tokenise_hyphons(pagenums, &(cur_item->firstpage), &(cur_item->lastpag=
e));
-			else
+			if(xmlNodeListGetString(file, node->xmlChildrenNode, 1) !=3D NULL)
+			/* ignore items without titles */
 			{
-				cur_item->firstpage =3D 0;
-				cur_item->lastpage =3D 0;
+				/* assign memory for new item */
+				cur_section->item =3D
+					assignnew_it( &(cur_section->no_of_items), cur_section->item);
+
+				cur_item =3D cur_section->item[cur_section->no_of_items];
+
+				/* parse item */
+				cur_item->title =3D xmlNodeListGetString(file, node->xmlChildrenNode, =
1);
+				if(pagenums =3D (char *) xmlGetProp(node, "pages"))
+					tokenise_hyphons(pagenums, &(cur_item->firstpage), &(cur_item->lastpa=
ge));
+				else
+				{
+					cur_item->firstpage =3D 0;
+					cur_item->lastpage =3D 0;
+				}
 			}
-			cur_item++;
 		}
 	node =3D node->next;=09
 	}
-	cur_item =3D 0;
 }
=20
 void tokenise_hyphons(char to_token[10], int * first, int * last)



* added files

--- /dev/null
+++ /home/nick/programming/c/getht/getht-mainline/,,what-changed.getht--mai=
nline--0.1--patch-20--getht@sv.gnu.org/new-files-archive/./.arch-ids/issuem=
em.c.id
@@ -0,0 +1 @@
+Nick White <arch@njw.me.uk> Sun Apr 29 14:07:34 2007 6736.0
--- /dev/null
+++ /home/nick/programming/c/getht/getht-mainline/,,what-changed.getht--mai=
nline--0.1--patch-20--getht@sv.gnu.org/new-files-archive/./issuemem.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2006 Nick White
+ *
+ * This file is part of GetHT
+ *=20
+ * GetHT 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.
+ *
+ * GetHT 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 GetHT; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  =
USA
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "issue.h"
+
+void nogo_mem()
+/*	called if memory assignation fails
+ *	TODO: handle freeing of memory to avoid leaks */
+{
+	fprintf(stderr, "Could not assign memory, exitting\n");
+	exit(1);
+}
+
+iss ** assignnew_iss(int *no_of_issues, iss ** issue)
+/* assign memory for new issue */
+{
+	iss ** tmp =3D NULL;
+
+	if(*no_of_issues < 0)
+	{       /* make issue** a new array of issue pointers */
+		if( (tmp =3D malloc(sizeof(iss *))) =3D=3D NULL )
+			nogo_mem();
+	}
+	else
+	{       /* add a new pointer to issue pointer list */
+		if( (tmp =3D realloc(issue, sizeof(iss *) + (((*no_of_issues)+1) * sizeo=
f(iss *)))) =3D=3D NULL )
+			nogo_mem();
+	}
+
+	(*no_of_issues)++;
+=09
+	/* make new array item a pointer to issue */
+	if( (tmp[*no_of_issues] =3D malloc(sizeof(iss))) =3D=3D NULL )
+		nogo_mem();
+
+	return tmp;
+}
+
+sec ** assignnew_sec(int *no_of_sections, sec ** section)
+/* assign memory for new section */
+{
+	sec ** tmp =3D NULL;
+
+	if(*no_of_sections < 0)
+	{       /* make **section a new array of section pointers */
+		if( (tmp =3D malloc(sizeof(sec *))) =3D=3D NULL )
+			nogo_mem();
+	}
+	else
+	{       /* add a new pointer to section pointer list */
+		if( (tmp =3D realloc(section, sizeof(sec *) + (((*no_of_sections)+1) * s=
izeof(sec *)))) =3D=3D NULL )
+			nogo_mem();
+	}
+=09
+	(*no_of_sections)++;
+
+	/* make new array item a pointer to issue */
+	if( (tmp[*no_of_sections] =3D malloc(sizeof(sec))) =3D=3D NULL )
+		nogo_mem();
+
+	return tmp;
+}
+
+it ** assignnew_it(int * no_of_items, it ** item)
+{
+	it ** tmp =3D NULL;
+
+	if(*no_of_items < 0)
+	{       /* make **item a new array of item pointers */
+		if( (tmp =3D malloc(sizeof(it *))) =3D=3D NULL )
+			nogo_mem();
+										                        }
+	else
+	{       /* add a new pointer to item pointer list */
+		if( (tmp =3D realloc(item, sizeof(it *) + (((*no_of_items)+1) * sizeof(i=
t *)))) =3D=3D NULL )
+			nogo_mem();
+	}
+
+	(*no_of_items)++;
+
+	/* make new array item a pointer to item */
+	if( (tmp[*no_of_items] =3D malloc(sizeof(it))) =3D=3D NULL )
+		nogo_mem();
+
+	return tmp;
+}


--a8Wt8u1KmwUX3Y2C
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGNJjEH0hWdATkZT8RAoaLAJ9HnI78absECmoay8mF30geNqlGzQCeIADk
BeAhzWNIZY567G0XKCxbvJ4=
=8s+p
-----END PGP SIGNATURE-----

--a8Wt8u1KmwUX3Y2C--



From MAILER-DAEMON Mon Apr 30 04:38:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiRPH-00046w-RF
	for mharc-getht-commit@gnu.org; Mon, 30 Apr 2007 04:38:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiRPG-00046r-2B
	for getht-commit@nongnu.org; Mon, 30 Apr 2007 04:38:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiRPE-00046f-Qe
	for getht-commit@nongnu.org; Mon, 30 Apr 2007 04:38:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiRPE-00046N-IM
	for getht-commit@nongnu.org; Mon, 30 Apr 2007 04:38:48 -0400
Received: from outmail129145.authsmtp.co.uk ([62.13.129.145])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <nick@njw.me.uk>) id 1HiRJ2-0005p7-Me
	for getht-commit@nongnu.org; Mon, 30 Apr 2007 04:32:25 -0400
Received: from outmail128177.authsmtp.com (outmail128177.authsmtp.com
	[62.13.128.177])
	by punt2.authsmtp.com (8.13.8/8.13.8/Kp) with ESMTP id l3U8WNk2083317
	for <getht-commit@nongnu.org>; Mon, 30 Apr 2007 09:32:23 +0100 (BST)
Received: from localhost ([194.80.176.253]) (authenticated bits=0)
	by mail.authsmtp.com (8.13.8/8.13.8/Kp) with ESMTP id l3U8WN6l053666
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <getht-commit@nongnu.org>; Mon, 30 Apr 2007 09:32:23 +0100 (BST)
Date: Mon, 30 Apr 2007 09:35:23 +0100
From: Nick <nick@njw.me.uk>
To: getht-commit@nongnu.org
Message-ID: <20070430083523.GA21642@cutie1.lan>
Mail-Followup-To: getht-commit@nongnu.org
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="Qxx1br4bt0+wmkIi"
Content-Disposition: inline
User-Agent: Mutt/1.5.13 (2006-08-11)
X-Server-Quench: 51ba4b60-f6f5-11db-a443-001185d377ca
X-AuthRoute: OCdxYQ8WA1ZTTQ8Z IiUGE2lFREM4JQtD DAMDMU5RJ18MVBh5
	NEFcIVxOdloGSkcC A3l6GxZLUl1xXnN1 YgBSbw9fYQRPVgF0
	WEhXQ1VUCgdtAgMF ABsBU1cudGBOHwB2 OUZnXXZdWgp7dkJ1
	QQBRFD9XYTVmaH1J VhZdagJVJFFXLxtB aU1/VHIMaWBTZX1n
	FAYlNio6PX1ULyFQ Qx1fZV0fXUYXW3s5 ThEEGTQpEAhAH2Nq
	alk+I0IXHANLaC0w 
X-Authentic-SMTP: 61633231373330.squirrel.dmpriest.net.uk:646/Kp
X-Report-SPAM: If SPAM / abuse - report it at: http://www.authsmtp.com/abuse
X-Virus-Status: No virus detected - but ensure you scan with your own
	anti-virus system!
X-detected-kernel: FreeBSD 6.x (1)
Subject: [Getht-commit] arch commit: getht--mainline--0.1--patch-22
X-BeenThere: getht-commit@nongnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: getht-general@nongnu.org
List-Id: Repository Commit List <getht-commit.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/getht-commit>,
	<mailto:getht-commit-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/getht-commit>
List-Post: <mailto:getht-commit@nongnu.org>
List-Help: <mailto:getht-commit-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/getht-commit>,
	<mailto:getht-commit-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 08:38:50 -0000


--Qxx1br4bt0+wmkIi
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Revision: getht--mainline--0.1--patch-22
Archive: getht@sv.gnu.org
Creator: Nick White <arch@njw.me.uk>
Date: Mon Apr 30 09:34:43 BST 2007
Standard-date: 2007-04-30 08:34:43 GMT
Modified-files: getht.c issue.h issuemem.c mediarev.c
    mediaxml.c tocxml.c
New-patches: getht@sv.gnu.org/getht--mainline--0.1--patch-22
Summary: Removed last of static issue array code, added sorting
Keywords:=20

Removed defined constants from issue.h previously used to
determine size of static arrays
Removed unused separate show media structure function
Remove clean media & clean issue functions
Added issue sorting code
M  issuemem.c
M  getht.c
M  issue.h
M  mediarev.c
M  mediaxml.c
M  tocxml.c

* modified files

--- orig/getht.c
+++ mod/getht.c
@@ -36,10 +36,6 @@
 med * findnewestmed(iss ** issue, int no_of_issues);
=20
 void show_iss_struct(iss ** issue, int no_of_issues);
-void show_med_struct(med * issue);
-
-void clearmed(med * cur_media);
-void cleariss(iss * cur_issue);
=20
 void showusage();
=20
@@ -297,20 +293,10 @@
 		if(save_file(NULL, MEDIA_TOC_URL, media_rev))
 			return 1;
 =09
-		med temp_med[MED_NO];
-=09
-		clearmed(temp_med);
-		/* BUG: for no good reason, this resets title[] too...
-		 * Until we can find why, just get the title again */
-
-		cur_identifiers(issue_xml, isstitle, &date);
-
+		med ** temp_med;
 		int med_no =3D -1;
-		if(parsemediagz(media_rev, temp_med, &med_no))
-			return 1;
-		/* BUG: this blanks title too... strange
-		 * Until we can find why, just get the title again */
-		cur_identifiers(issue_xml, isstitle, &date);
+
+		temp_med =3D parsemediagz(media_rev, &med_no);
=20
 		unlink(media_rev);
=20
@@ -325,7 +311,7 @@
 {
 	int iss_no, sec_no, med_no, it_no;
 	printf("%i Issues\n",no_of_issues);
-	for(iss_no=3D0;iss_no<no_of_issues;iss_no++)
+	for(iss_no=3D0;iss_no<=3Dno_of_issues;iss_no++)
 	{
 		printf("-Issue %i-\n", (iss_no+1));
 		printf("Title:\t'%s'\n", issue[iss_no]->title);
@@ -366,65 +352,6 @@
 	}
 }
=20
-void show_med_struct(med * cur_media)
-/*	Prints media information */
-{
-	int tmp;
-	for(tmp=3D0;tmp<MED_NO;cur_media++,tmp++)
-	{
-		printf("--Media item--\n");
-
-		printf("uri: '%s'\n", cur_media->uri);
-		printf("title: '%s'\n", cur_media->title);
-		printf("comment: '%s'\n", cur_media->comment);
-		printf("preview_uri: '%s'\n", cur_media->preview_uri);
-		printf("size: '%i'\n", cur_media->size);
-
-		printf("\n");
-	}
-}
-
-void cleariss(iss * cur_issue)
-/*	turns off exist flags for all issue structures */
-{
-	int tmp;
-	for(tmp=3D0; tmp<MAX_ISS; cur_issue++,tmp++)
-	{
-		cur_issue->preview_uri[0] =3D '\0';
-		cur_issue->title[0] =3D '\0';
-		cur_issue->size =3D 0;
-		cur_issue->no_of_sections =3D -1;
-		cur_issue->section =3D NULL;
-		cur_issue->no_of_media =3D -1;
-		cur_issue->media =3D NULL;
-		//clearmed(cur_issue->media);
-	}
-}
-
-void clearmed(med * cur_media)
-/*	clears the members of a media array */
-{
-	cur_media->uri[0] =3D '\0';
-	cur_media->title[0] =3D '\0';
-	cur_media->comment[0] =3D '\0';
-	cur_media->preview_uri[0] =3D '\0';
-	cur_media->size =3D 0;
-}
-
-void clearsec(sec * cur_section)
-/*	clears all members of section arrays */
-{
-	int tmp;
-	for(tmp=3D0; tmp<=3DSEC_NO; cur_section++,tmp++)
-	{
-		cur_section->uri[0] =3D '\0';
-		cur_section->title[0] =3D '\0';
-		cur_section->size =3D 0;
-		cur_section->number =3D 0;
-		cur_section->no_of_items =3D 0;
-	}
-}
-
 int findnewestiss(iss ** issue, int no_of_issues)
 /*	returns newest issue indice */
 {


--- orig/issue.h
+++ mod/issue.h
@@ -19,10 +19,6 @@
  *
  */
=20
-#define	SEC_NO	5
-#define	ITEM_NO	30
-#define	MED_NO	2
-
 /* all sizes are in bytes and are child-inclusive */
=20
 typedef struct
@@ -73,6 +69,9 @@
 iss ** parsetoc(char *filepath, int * iss_no, int * latest);
 iss ** parsemedia(char * filepath, iss ** issue, int * no_of_issues);
=20
-iss ** assignnew_iss(int *no_of_issues, iss ** issue);
-sec ** assignnew_sec(int *no_of_sections, sec ** section);
-it ** assignnew_it(int * no_of_items, it ** item);
+med ** parsemediagz(char * media_path, int * no_of_media);
+
+iss ** assignnew_iss(iss ** issue, int *no_of_issues);
+sec ** assignnew_sec(sec ** section, int * no_of_sections);
+it ** assignnew_it(it ** item, int * no_of_items);
+med ** assignnew_med(med ** media, int * no_of_media);


--- orig/issuemem.c
+++ mod/issuemem.c
@@ -21,6 +21,7 @@
=20
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
=20
 #include "issue.h"
=20
@@ -32,7 +33,7 @@
 	exit(1);
 }
=20
-iss ** assignnew_iss(int *no_of_issues, iss ** issue)
+iss ** assignnew_iss(iss ** issue, int *no_of_issues)
 /* assign memory for new issue */
 {
 	iss ** tmp =3D NULL;
@@ -57,7 +58,7 @@
 	return tmp;
 }
=20
-sec ** assignnew_sec(int *no_of_sections, sec ** section)
+sec ** assignnew_sec(sec ** section, int *no_of_sections)
 /* assign memory for new section */
 {
 	sec ** tmp =3D NULL;
@@ -82,7 +83,7 @@
 	return tmp;
 }
=20
-it ** assignnew_it(int * no_of_items, it ** item)
+it ** assignnew_it(it ** item, int * no_of_items)
 {
 	it ** tmp =3D NULL;
=20
@@ -105,3 +106,69 @@
=20
 	return tmp;
 }
+
+med ** assignnew_med(med ** media, int * no_of_media)
+{
+	med ** tmp =3D NULL;
+
+	if(*no_of_media < 0)
+	{       /* make **section a new array of section pointers */
+		if( (tmp =3D malloc(sizeof(med *))) =3D=3D NULL )
+			nogo_mem();
+	}
+	else
+	{       /* add a new pointer to media pointer list */
+		if( (tmp =3D realloc(media, sizeof(med *) + (((*no_of_media)+1) * sizeof=
(med *)))) =3D=3D NULL )
+			nogo_mem();
+	}
+
+	(*no_of_media)++;                                        =20
+
+	/* make new array item a pointer to issue */
+	if( (tmp[*no_of_media] =3D malloc(sizeof(med))) =3D=3D NULL )
+		nogo_mem();
+
+	return tmp;
+}
+
+int issuesort(iss ** issue, int no_of_issues)
+/* does a basic bubble sort, by date, returning sorted issue */
+{
+	int sortindex[no_of_issues];
+
+	int count1, count2, temp;
+=09
+	for(count1 =3D 0; count1 <=3D no_of_issues; count1++)
+		sortindex[count1] =3D count1;
+
+	/* find correct order of issues using a bubble sort */
+	for(count1 =3D 0; count1 <=3Dno_of_issues; count1++)
+	{
+		for(count2 =3D 0; count2 < no_of_issues; count2++)
+		{
+			if(issue[sortindex[count2]]->date.year < issue[sortindex[count2+1]]->da=
te.year)
+			{
+				temp =3D sortindex[count2];
+				sortindex[count2] =3D sortindex[count2+1];
+				sortindex[count2+1] =3D temp;
+			}
+			else if((issue[sortindex[count2]]->date.year =3D=3D issue[sortindex[cou=
nt2+1]]->date.year) &&
+				(issue[sortindex[count2]]->date.firstmonth < issue[sortindex[count2+1]=
]->date.firstmonth))
+			{
+				temp =3D sortindex[count2];
+				sortindex[count2] =3D sortindex[count2+1];
+				sortindex[count2+1] =3D temp;
+			}
+		}
+	}
+
+	iss * sortedissue[no_of_issues];
+
+	for(count1 =3D 0; count1 <=3D no_of_issues; count1++)
+		sortedissue[count1] =3D issue[sortindex[count1]];
+
+	for(count1 =3D 0; count1 <=3D no_of_issues; count1++)
+		issue[count1] =3D sortedissue[count1];
+
+	return 0;
+}


--- orig/mediarev.c
+++ mod/mediarev.c
@@ -30,17 +30,21 @@
 void getquote(char * input, char * label);
 void removeleadingspace(char * cur_line);
=20
-int parsemediagz(char * media_path, med * cur_media, int * no_of_media)
+med ** parsemediagz(char * media_path, int * no_of_media)
 /*	Parses gzipped adobe pagemaker files for media urls and metadata,
- *	filling cur_media with the information. */
+ *	filling media with the information. */
 {
 	char cur_line[STR_MAX];
 	gzFile mediagz;
=20
+	med ** media =3D NULL;
+
 	strcpy(cur_line,""); /* reset cur_line */
=20
 	mediagz =3D gzopen(media_path, "r");
=20
+	med * cur_media;
+
 	while(gzeof(mediagz)=3D=3D0)
 	{
 		gzgets(mediagz, cur_line, STR_MAX);
@@ -49,6 +53,20 @@
 		if(!strcmp(cur_line,"on mouseUp"))
 		{
 			strcpy(cur_line,""); /* reset cur_line */
+
+			/* assign memory for the new media */
+			media =3D assignnew_med(media, no_of_media);
+
+			cur_media =3D media[*no_of_media];
+
+			/* setup media globals */
+			cur_media->uri[0] =3D '\0';
+			cur_media->title[0] =3D '\0';
+			cur_media->comment[0] =3D '\0';
+			cur_media->preview_uri[0] =3D '\0';
+			cur_media->size =3D 0;
+
+			/* process rev file */
 			while(strcmp(cur_line,"end mouseUp") && gzeof(mediagz)=3D=3D0)
 			{
 				strcpy(cur_line,""); /* reset cur_line */
@@ -72,16 +90,11 @@
 					getquote(cur_line,cur_media->comment);
 				}
 			}
-			*cur_media++;
-			(*no_of_media)++;
 		}
 		strcpy(cur_line,""); /* reset cur_line */
 	}
=20
-	if(*no_of_media =3D=3D -1)
-		return 1;
-
-	return 0;
+	return media;
 }
=20
 int smilurl(char * smilurl, med * cur_media)


--- orig/mediaxml.c
+++ mod/mediaxml.c
@@ -66,7 +66,7 @@
 	return found;
 }
=20
-int addmediaissue(char * filepath, char * title, issdates * date, med * me=
dia, int med_no)
+int addmediaissue(char * filepath, char * title, issdates * date, med ** m=
edia, int med_no)
 /*	Appends data from media structures to xml file. */
 {
 	xmlDocPtr media_file;
@@ -99,17 +99,18 @@
 	xmlNewProp(curissue, "lastmonth", tmp);
=20
 	xmlNodePtr curitem;
-	int i;
-	for(i =3D 0; i <=3D med_no; i++)
+
+	int count;
+	for(count =3D 0; count <=3D med_no; count++)
 	{
-		curitem =3D xmlNewTextChild(curissue, NULL, "item", media[i].title);
+		curitem =3D xmlNewTextChild(curissue, NULL, "item", media[count]->title);
=20
-		xmlNewProp(curitem, "uri", media[i].uri);
+		xmlNewProp(curitem, "uri", media[count]->uri);
=20
-		if(media[i].comment)
-			xmlNewProp(curitem, "comment", media[i].comment);
-		if(media[i].preview_uri)
-			xmlNewProp(curitem, "preview_uri", media[i].preview_uri);
+		if(media[count]->comment)
+			xmlNewProp(curitem, "comment", media[count]->comment);
+		if(media[count]->preview_uri)
+			xmlNewProp(curitem, "preview_uri", media[count]->preview_uri);
 	}
=20
 	xmlKeepBlanksDefault(0);
@@ -198,8 +199,6 @@
=20
 			issue[tmp]->no_of_media =3D -1;
=20
-			med ** tmpmed =3D NULL;
-
 			itnode =3D node->xmlChildrenNode;
=20
 			while (itnode !=3D NULL)
@@ -207,30 +206,17 @@
=20
 				if(!xmlStrcmp(itnode->name,(char *) "item"))
 				{
-					/* assign memory for new media */
-					if(cur_issue->no_of_media < 0)
-					{       /* make **section a new array of section pointers */
-						if( (tmpmed =3D malloc(sizeof(med *))) =3D=3D NULL )
-						nogo_mem();
-					}
-					else
-					{       /* add a new pointer to media pointer list */
-						if( (tmpmed =3D realloc(cur_issue->media, sizeof(med *) + ((cur_issu=
e->no_of_media+1) * sizeof(med *)))) =3D=3D NULL )
-						nogo_mem();
-					}
-
-					cur_issue->no_of_media++;
-
-					/* make new array item a pointer to issue */
-					if( (tmpmed[cur_issue->no_of_media] =3D malloc(sizeof(med))) =3D=3D N=
ULL )
-						nogo_mem();
-
-					cur_issue->media =3D tmpmed;
-					/* memory for seoction all dealt with */
+					/* assign memory for the new media */
+					cur_issue->media =3D assignnew_med(cur_issue->media, &(cur_issue->no_=
of_media));
=20
+					/* setup media globals */
 					cur_media =3D cur_issue->media[cur_issue->no_of_media];
 				=09
-					clearmed(cur_media);
+					cur_media->uri[0] =3D '\0';
+					cur_media->title[0] =3D '\0';
+					cur_media->comment[0] =3D '\0';
+					cur_media->preview_uri[0] =3D '\0';
+					cur_media->size =3D 0;
=20
 					/* add media info to cur_media */
 					if(xmlGetProp(itnode, "uri"))
@@ -254,5 +240,7 @@
=20
 	xmlFreeDoc(media_file);
=20
+	issuesort(issue, no_of_issues);
+
 	return issue;
 }


--- orig/tocxml.c
+++ mod/tocxml.c
@@ -50,7 +50,6 @@
 	no_of_issues =3D -1;
=20
 	iss ** issue =3D NULL;
-	//iss ** tmp =3D NULL;
=20
 	int year;
=20
@@ -66,7 +65,7 @@
     				if(!xmlStrncmp(cnode->name,(char *) "issue",5))
 				{
 					/* assign memory for the new issue */
-					issue =3D assignnew_iss(&no_of_issues, issue);
+					issue =3D assignnew_iss(issue, &no_of_issues);
=20
 					/* setup issue globals */
 					issue[no_of_issues]->no_of_media =3D -1;
@@ -91,6 +90,8 @@
=20
 	*iss_no =3D no_of_issues;
=20
+	issuesort(issue, no_of_issues);
+
 	return issue;
 }
=20
@@ -111,7 +112,7 @@
 		{
 			/* assign memory for new section */
 			cur_issue->section =3D=20
-				assignnew_sec(&(cur_issue->no_of_sections), cur_issue->section);
+				assignnew_sec(cur_issue->section, &(cur_issue->no_of_sections));
=20
 			/* setup section globals */
 			cur_issue->section[cur_issue->no_of_sections]->no_of_items =3D -1;
@@ -153,7 +154,7 @@
 			{
 				/* assign memory for new item */
 				cur_section->item =3D
-					assignnew_it( &(cur_section->no_of_items), cur_section->item);
+					assignnew_it( cur_section->item, &(cur_section->no_of_items));
=20
 				cur_item =3D cur_section->item[cur_section->no_of_items];
=20




--Qxx1br4bt0+wmkIi
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGNapKH0hWdATkZT8RAtorAJ9NQgZmvoFkzAwYDFvseMEFtUCcxACfaWQ+
MKKUzcQohRCPoDpSoxqkb3M=
=Y6jF
-----END PGP SIGNATURE-----

--Qxx1br4bt0+wmkIi--



