From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 9ad3f79c
	for <source@mdocml.bsd.lv>;
	Fri, 29 Jul 2016 10:27:07 -0500 (EST)
Date: Fri, 29 Jul 2016 10:27:07 -0500 (EST)
Message-Id: <4112701050681365096.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Sort pages in the pages table by file names.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Sort pages in the pages table by file names.

Modified Files:
--------------
    mdocml:
        mandocdb.c

Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.223 -r1.224
--- mandocdb.c
+++ mandocdb.c
@@ -122,6 +122,7 @@ static	void	 mlink_add(struct mlink *, c
 static	void	 mlink_check(struct mpage *, struct mlink *);
 static	void	 mlink_free(struct mlink *);
 static	void	 mlinks_undupe(struct mpage *);
+int		 mpages_compare(const void *, const void *);
 static	void	 mpages_free(void);
 static	void	 mpages_merge(struct dba *, struct mparse *);
 static	void	 parse_cat(struct mpage *, int);
@@ -1084,22 +1085,30 @@ mlink_check(struct mpage *mpage, struct 
 static void
 mpages_merge(struct dba *dba, struct mparse *mp)
 {
-	struct mpage		*mpage, *mpage_dest;
+	struct mpage		**mplist, *mpage, *mpage_dest;
 	struct mlink		*mlink, *mlink_dest;
 	struct roff_man		*man;
 	char			*sodest;
 	char			*cp;
 	int			 fd;
-	unsigned int		 pslot;
+	unsigned int		 ip, npages, pslot;
 
+	npages = ohash_entries(&mpages);
+	mplist = mandoc_reallocarray(NULL, npages, sizeof(*mplist));
+	ip = 0;
 	mpage = ohash_first(&mpages, &pslot);
 	while (mpage != NULL) {
 		mlinks_undupe(mpage);
-		if ((mlink = mpage->mlinks) == NULL) {
-			mpage = ohash_next(&mpages, &pslot);
-			continue;
-		}
+		if (mpage->mlinks != NULL)
+			mplist[ip++] = mpage;
+		mpage = ohash_next(&mpages, &pslot);
+	}
+	npages = ip;
+	qsort(mplist, npages, sizeof(*mplist), mpages_compare);
 
+	for (ip = 0; ip < npages; ip++) {
+		mpage = mplist[ip];
+		mlink = mpage->mlinks;
 		name_mask = NAME_MASK;
 		mandoc_ohash_init(&names, 4, offsetof(struct str, key));
 		mandoc_ohash_init(&strings, 6, offsetof(struct str, key));
@@ -1207,8 +1216,18 @@ mpages_merge(struct dba *dba, struct mpa
 nextpage:
 		ohash_delete(&strings);
 		ohash_delete(&names);
-		mpage = ohash_next(&mpages, &pslot);
 	}
+	free(mplist);
+}
+
+int
+mpages_compare(const void *vp1, const void *vp2)
+{
+	const struct mpage	*mp1, *mp2;
+
+	mp1 = *(const struct mpage **)vp1;
+	mp2 = *(const struct mpage **)vp2;
+	return strcmp(mp1->mlinks->file, mp2->mlinks->file);
 }
 
 static void
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv