diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-09-02 13:34:01 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-09-02 13:34:01 +0400 |
| commit | fa06cf6edf86aa1839d4f43bfd3bd9a3a36b5223 (patch) | |
| tree | 705466443ec58fffa74a3499a3bcc56be1cdee9d /debian/patches/0008-missing-else-in-xlink.c.patch | |
| parent | 08f466c86ef859f2f3ab1f65677536cbccd85960 (diff) | |
| parent | 3a8c2d58eab0410fe5e79a112614aa9be061dc46 (diff) | |
| download | libxml2-fa06cf6edf86aa1839d4f43bfd3bd9a3a36b5223.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/debian-xml-sgml/libxml2
Conflicts:
debian/changelog
debian/control
debian/rules
Diffstat (limited to 'debian/patches/0008-missing-else-in-xlink.c.patch')
| -rw-r--r-- | debian/patches/0008-missing-else-in-xlink.c.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/debian/patches/0008-missing-else-in-xlink.c.patch b/debian/patches/0008-missing-else-in-xlink.c.patch new file mode 100644 index 0000000..88a4e86 --- /dev/null +++ b/debian/patches/0008-missing-else-in-xlink.c.patch @@ -0,0 +1,22 @@ +From: Ami Fischman <fischman@google.com> +Date: Tue, 2 Jul 2013 09:47:26 +0800 +Subject: missing else in xlink.c + +Obviously forgotten +--- + xlink.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xlink.c b/xlink.c +index 3566e06..c0e4ff3 100644 +--- a/xlink.c ++++ b/xlink.c +@@ -150,7 +150,7 @@ xlinkIsLink (xmlDocPtr doc, xmlNodePtr node) { + 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; |