summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Wellnhofer <wellnhofer@aevum.de>2010-11-08 11:14:26 +0100
committerDaniel Veillard <veillard@redhat.com>2010-11-08 11:14:26 +0100
commit1a40591d824391efd377a0859a9fab928a36f498 (patch)
treeb47eff6ab142dcd82e543c5e4c746211aff0fc60
parentc632bf37dd2c924d20b23c46c9452d29d7739fc8 (diff)
downloadlibxslt-1a40591d824391efd377a0859a9fab928a36f498.tar.gz
libxslt-1a40591d824391efd377a0859a9fab928a36f498.tar.bz2
libxslt-1a40591d824391efd377a0859a9fab928a36f498.zip
Fix some warnings in the refactored code
-rw-r--r--libxslt/namespaces.c2
-rw-r--r--libxslt/variables.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/libxslt/namespaces.c b/libxslt/namespaces.c
index 3e3891fb..48cf0391 100644
--- a/libxslt/namespaces.c
+++ b/libxslt/namespaces.c
@@ -585,7 +585,7 @@ declare_new_prefix:
int counter = 1;
if (nsPrefix == NULL) {
- nsPrefix = "ns";
+ nsPrefix = BAD_CAST "ns";
}
do {
diff --git a/libxslt/variables.c b/libxslt/variables.c
index 43a61561..cb0d4b04 100644
--- a/libxslt/variables.c
+++ b/libxslt/variables.c
@@ -675,6 +675,9 @@ xsltStackLookup(xsltTransformContextPtr ctxt, const xmlChar *name,
return(NULL);
}
+#ifdef XSLT_REFACTORED
+#else
+
/**
* xsltCheckStackElem:
* @ctxt: xn XSLT transformation context
@@ -710,6 +713,8 @@ xsltCheckStackElem(xsltTransformContextPtr ctxt, const xmlChar *name,
return(1);
}
+#endif /* XSLT_REFACTORED */
+
/**
* xsltAddStackElem:
* @ctxt: xn XSLT transformation context
@@ -1045,7 +1050,11 @@ xsltEvalGlobalVariable(xsltStackElemPtr elem, xsltTransformContextPtr ctxt)
#endif
oldInst = ctxt->inst;
+#ifdef XSLT_REFACTORED
+ comp = (xsltStyleBasicItemVariablePtr) elem->comp;
+#else
comp = elem->comp;
+#endif
oldVarName = elem->name;
elem->name = xsltComputingGlobalVarMarker;
/*