Skip to content
This repository was archived by the owner on Feb 24, 2024. It is now read-only.

Fixes to build with libxml 2.12.0 #246

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions xmlstarlet/no-exit.patch
Original file line number Diff line number Diff line change
Expand Up @@ -588,9 +588,9 @@ index e199178..afd931b 100644
const edOptions* g_ops)
{
@@ -559,7 +569,7 @@ edOutput(const char* filename, const XmlEdAction* ops, int ops_count,
{
cleanupNSArr(ns_arr);
xmlCleanupParser();
xmlCleanupGlobals();
- exit(EXIT_BAD_FILE);
+ return EXIT_BAD_FILE;
}
Expand Down Expand Up @@ -658,7 +658,7 @@ index e199178..afd931b 100644
if (arg[0] == '-')
{
if (ops_count >= max_ops_count)
@@ -741,17 +763,23 @@ edMain(int argc, char **argv)
@@ -741,16 +763,22 @@ edMain(int argc, char **argv)

if (i >= argc)
{
Expand All @@ -682,7 +682,6 @@ index e199178..afd931b 100644
xmlFree(ops);
cleanupNSArr(ns_arr);
xmlCleanupParser();
xmlCleanupGlobals();
- return 0;
+
+ return ret;
Expand Down
3 changes: 3 additions & 0 deletions xmlstarlet/src/trans.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/* $Id: trans.c,v 1.19 2004/11/22 02:28:21 mgrouch Exp $ */

#include <config.h>

#include <libxml/xmlsave.h>

#include "trans.h"
#include "xmlstar.h"

Expand Down
2 changes: 0 additions & 2 deletions xmlstarlet/src/xml_edit.c
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,6 @@ edOutput(const char* filename, const XmlEdAction* ops, int ops_count,
{
cleanupNSArr(ns_arr);
xmlCleanupParser();
xmlCleanupGlobals();
exit(EXIT_BAD_FILE);
}

Expand Down Expand Up @@ -752,6 +751,5 @@ edMain(int argc, char **argv)
xmlFree(ops);
cleanupNSArr(ns_arr);
xmlCleanupParser();
xmlCleanupGlobals();
return 0;
}
1 change: 1 addition & 0 deletions xmlstarlet/src/xml_format.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ THE SOFTWARE.
#include <libxml/xmlmemory.h>
#include <libxml/debugXML.h>
#include <libxml/xmlIO.h>
#include <libxml/xmlsave.h>
#include <libxml/HTMLtree.h>
#include <libxml/xinclude.h>
#include <libxml/xpath.h>
Expand Down