0
@@ -144,29 +144,29 @@ static void print_html_element(GString *out, element elt, bool obfuscate) {
0
         g_string_append_printf(out, "%s", elt.contents.str);
0
         break;
0
     case LINK:
0
-        if (strstr(elt.contents.link.url, "mailto:") == elt.contents.link.url)
0
+        if (strstr(elt.contents.link->url, "mailto:") == elt.contents.link->url)
0
             obfuscate = true;  /* obfuscate mailto: links */
0
         g_string_append_printf(out, "<a href=\"");
0
-        print_html_string(out, elt.contents.link.url, obfuscate);
0
+        print_html_string(out, elt.contents.link->url, obfuscate);
0
         g_string_append_printf(out, "\"");
0
-        if (strlen(elt.contents.link.title) > 0) {
0
+        if (strlen(elt.contents.link->title) > 0) {
0
             g_string_append_printf(out, " title=\"");
0
-            print_html_string(out, elt.contents.link.title, obfuscate);
0
+            print_html_string(out, elt.contents.link->title, obfuscate);
0
             g_string_append_printf(out, "\"");
0
         }
0
         g_string_append_printf(out, ">");
0
-        print_html_element_list(out, elt.contents.link.label, obfuscate);
0
+        print_html_element_list(out, elt.contents.link->label, obfuscate);
0
         g_string_append_printf(out, "</a>");
0
         break;
0
     case IMAGE:
0
         g_string_append_printf(out, "<img src=\"");
0
-        print_html_string(out, elt.contents.link.url, obfuscate);
0
+        print_html_string(out, elt.contents.link->url, obfuscate);
0
         g_string_append_printf(out, "\" alt=\"");
0
-        print_html_element_list(out, elt.contents.link.label, obfuscate);
0
+        print_html_element_list(out, elt.contents.link->label, obfuscate);
0
         g_string_append_printf(out, "\"");
0
-        if (strlen(elt.contents.link.title) > 0) {
0
+        if (strlen(elt.contents.link->title) > 0) {
0
             g_string_append_printf(out, " title=\"");
0
-            print_html_string(out, elt.contents.link.title, obfuscate);
0
+            print_html_string(out, elt.contents.link->title, obfuscate);
0
             g_string_append_printf(out, "\"");
0
         }
0
         g_string_append_printf(out, " />");
0
@@ -393,12 +393,12 @@ static void print_latex_element(GString *out, element elt) {
0
         /* don't print HTML */
0
         break;
0
     case LINK:
0
-        g_string_append_printf(out, "\\href{%s}{", elt.contents.link.url);
0
-        print_latex_element_list(out, elt.contents.link.label);
0
+        g_string_append_printf(out, "\\href{%s}{", elt.contents.link->url);
0
+        print_latex_element_list(out, elt.contents.link->label);
0
         g_string_append_printf(out, "}");
0
         break;
0
     case IMAGE:
0
-        g_string_append_printf(out, "\\includegraphics{%s}", elt.contents.link.url);
0
+        g_string_append_printf(out, "\\includegraphics{%s}", elt.contents.link->url);
0
         break;
0
     case EMPH:
0
         g_string_append_printf(out, "\\emph{");
0
@@ -595,13 +595,13 @@ static void print_groff_mm_element(GString *out, element elt, int count) {
0
         /* don't print HTML */
0
         break;
0
     case LINK:
0
-        print_groff_mm_element_list(out, elt.contents.link.label);
0
-        g_string_append_printf(out, " (%s)", elt.contents.link.url);
0
+        print_groff_mm_element_list(out, elt.contents.link->label);
0
+        g_string_append_printf(out, " (%s)", elt.contents.link->url);
0
         padded = 0;
0
         break;
0
     case IMAGE:
0
         g_string_append_printf(out, "[IMAGE: ");
0
-        print_groff_mm_element_list(out, elt.contents.link.label);
0
+        print_groff_mm_element_list(out, elt.contents.link->label);
0
         g_string_append_printf(out, "]");
0
         padded = 0;
0
         /* not supported */

0
@@ -136,9 +136,10 @@ static element * mk_list(int key, element *lst) {
0
 static element * mk_link(element *label, char *url, char *title) {
0
     element *result;
0
     result = mk_element(LINK);
0
-    result->contents.link.label = label;
0
-    result->contents.link.url = strdup(url);
0
-    result->contents.link.title = strdup(title);
0
+    result->contents.link = malloc(sizeof(link));
0
+    result->contents.link->label = label;
0
+    result->contents.link->url = strdup(url);
0
+    result->contents.link->title = strdup(title);
0
     return result;
0
 }
0
 
0
@@ -188,11 +189,11 @@ static bool match_inlines(element *l1, element *l2) {
0
  * 'link' is modified with the matching url and title. */
0
 static bool find_reference(link *result, element *label) {
0
     element *cur = references;  /* pointer to walk up list of references */
0
-    link curitem;
0
+    link *curitem;
0
     while (cur != NULL) {
0
         curitem = cur->contents.link;
0
-        if (match_inlines(label, curitem.label)) {
0
-            *result = curitem;
0
+        if (match_inlines(label, curitem->label)) {
0
+            *result = *curitem;
0
             return true;
0
         }
0
         else
0
@@ -919,11 +920,12 @@ void free_element_contents(element elt) {
0
         break;
0
       case LINK:
0
       case IMAGE:
0
-        free(elt.contents.link.url);
0
-        elt.contents.link.url = NULL;
0
-        free(elt.contents.link.title);
0
-        elt.contents.link.title = NULL;
0
-        free_element_list(elt.contents.link.label);
0
+        free(elt.contents.link->url);
0
+        elt.contents.link->url = NULL;
0
+        free(elt.contents.link->title);
0
+        elt.contents.link->title = NULL;
0
+        free_element_list(elt.contents.link->label);
0
+        free(elt.contents.link);
0
         break;
0
       default:
0
         ;

0
@@ -22,7 +22,7 @@ typedef struct Link link;
0
 /* Union for contents of an Element (string, list, or link). */
0
 union Contents {
0
     char             *str;
0
-    struct Link      link;
0
+    struct Link      *link;
0
 };
0
 
0
 /* Types of semantic values returned by parsers. */