Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxml/src/xlink.c

 /*
  * xlink.c : implementation of the hyperlinks detection module
  *           This version supports both XML XLinks and HTML simple links
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
 
@@ skipping 29 matching lines @@
 #include <libxml/globals.h>
 
 #define XLINK_NAMESPACE (BAD_CAST "http://www.w3.org/1999/xlink/namespace/")
 #define XHTML_NAMESPACE (BAD_CAST "http://www.w3.org/1999/xhtml/")
 
 /****************************************************************
  *                                                              *
  *           Default setting and related functions              *
  *                                                              *
  ****************************************************************/
- 
+
 static xlinkHandlerPtr xlinkDefaultHandler = NULL;
 static xlinkNodeDetectFunc      xlinkDefaultDetect = NULL;
 
 /**
  * xlinkGetDefaultHandler:
  *
  * Get the default xlink handler.
  *
  * Returns the current xlinkHandlerPtr value.
  */
@@ skipping 25 matching lines @@
 xlinkGetDefaultDetect   (void) {
     return(xlinkDefaultDetect);
 }
 
 /**
  * xlinkSetDefaultDetect:
  * @func: pointer to the new detection routine.
  *
  * Set the default xlink detection routine
  */
-void 
+void
 xlinkSetDefaultDetect   (xlinkNodeDetectFunc func) {
     xlinkDefaultDetect = func;
 }
 
 /****************************************************************
  *                                                              *
  *                  The detection routines                      *
  *                                                              *
  ****************************************************************/
 
- 
+
 /**
  * xlinkIsLink:
  * @doc:  the document containing the node
  * @node:  the node pointer itself
  *
  * Check whether the given node carries the attributes needed
  * to be a link element (or is one of the linking elements issued
  * from the (X)HTML DtDs).
  * This routine don't try to do full checking of the link validity
  * but tries to detect and return the appropriate link type.
  *
  * Returns the xlinkType of the node (XLINK_TYPE_NONE if there is no
  *         link detected.
  */
-xlinkType 
+xlinkType
 xlinkIsLink     (xmlDocPtr doc, xmlNodePtr node) {
     xmlChar *type = NULL, *role = NULL;
     xlinkType ret = XLINK_TYPE_NONE;
 
     if (node == NULL) return(XLINK_TYPE_NONE);
     if (doc == NULL) doc = node->doc;
     if ((doc != NULL) && (doc->type == XML_HTML_DOCUMENT_NODE)) {
         /*
          * This is an HTML document.
          */
@@ skipping 10 matching lines @@
     }
 
     /*
      * We don't prevent a-priori having XML Linking constructs on
      * XHTML elements
      */
     type = xmlGetNsProp(node, BAD_CAST"type", XLINK_NAMESPACE);
     if (type != NULL) {
         if (xmlStrEqual(type, BAD_CAST "simple")) {
             ret = XLINK_TYPE_SIMPLE;
-        } if (xmlStrEqual(type, BAD_CAST "extended")) {
+        } else if (xmlStrEqual(type, BAD_CAST "extended")) {
             role = xmlGetNsProp(node, BAD_CAST "role", XLINK_NAMESPACE);
             if (role != NULL) {
                 xmlNsPtr xlink;
                 xlink = xmlSearchNs(doc, node, XLINK_NAMESPACE);
                 if (xlink == NULL) {
                     /* Humm, fallback method */
-                    if (xmlStrEqual(role, BAD_CAST"xlink:external-linkset")) 
+                    if (xmlStrEqual(role, BAD_CAST"xlink:external-linkset"))
                         ret = XLINK_TYPE_EXTENDED_SET;
                 } else {
                     xmlChar buf[200];
                     snprintf((char *) buf, sizeof(buf), "%s:external-linkset",
                              (char *) xlink->prefix);
                     buf[sizeof(buf) - 1] = 0;
                     if (xmlStrEqual(role, buf))
                         ret = XLINK_TYPE_EXTENDED_SET;
 
                 }
 
             }
             ret = XLINK_TYPE_EXTENDED;
         }
     }
 
     if (type != NULL) xmlFree(type);
     if (role != NULL) xmlFree(role);
     return(ret);
 }
 #endif /* LIBXML_XPTR_ENABLED */
 #define bottom_xlink
 #include "elfgcchack.h"