Cleanups

Author: jeroen

R/init.R

@@ -1,7 +1,3 @@
-.onLoad <- function(lib, pkg) {
-  .Call(init_libxml2)
-}
-
 libxml2_version <- function() {
   as.numeric_version(.Call(libxml2_version_))
 }

src/Makevars.win

@@ -1,7 +1,7 @@
 PKG_CONFIG_NAME = libxml-2.0
 PKG_CONFIG ?= $(BINPREF)pkg-config
 PKG_LIBS := $(shell $(PKG_CONFIG) --libs $(PKG_CONFIG_NAME))
-STATIC_CFLAGS = -DLIBXML_STATIC -I../inst/include
+STATIC_CFLAGS = -DSTRICT_R_HEADERS -DR_NO_REMAP -DLIBXML_STATIC -I../inst/include
 
 ifneq ($(PKG_LIBS),)
 $(info using $(PKG_CONFIG_NAME) from Rtools)

src/init.c

@@ -20,7 +20,6 @@ extern SEXP doc_validate(SEXP, SEXP);
 extern SEXP doc_write_character(SEXP, SEXP, SEXP);
 extern SEXP doc_write_connection(SEXP, SEXP, SEXP, SEXP);
 extern SEXP doc_write_file(SEXP, SEXP, SEXP, SEXP);
-extern SEXP init_libxml2(void);
 extern SEXP libxml2_version_(void);
 extern SEXP node_append_child(SEXP, SEXP);
 extern SEXP node_append_content(SEXP, SEXP);
@@ -85,7 +84,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"doc_write_character",       (DL_FUNC) &doc_write_character,       3},
     {"doc_write_connection",      (DL_FUNC) &doc_write_connection,      4},
     {"doc_write_file",            (DL_FUNC) &doc_write_file,            4},
-    {"init_libxml2",              (DL_FUNC) &init_libxml2,              0},
     {"libxml2_version_",          (DL_FUNC) &libxml2_version_,          0},
     {"node_append_child",         (DL_FUNC) &node_append_child,         2},
     {"node_append_content",       (DL_FUNC) &node_append_content,       2},
@@ -138,8 +136,10 @@ static const R_CallMethodDef CallEntries[] = {
     {NULL, NULL, 0}
 };
 
+void init_libxml2_library();
 void R_init_xml2(DllInfo *dll)
 {
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
     R_useDynamicSymbols(dll, FALSE);
+    init_libxml2_library();
 }

src/xml2_init.cpp src/xml2_init.csrc/xml2_init.cpp renamed to src/xml2_init.c

@@ -1,11 +1,7 @@
 #include <Rinternals.h>
-#include <R_ext/Rdynload.h>
-#include <stdio.h>
 #include <libxml/xmlversion.h>
 #include <libxml/xmlerror.h>
-#include <libxml/parser.h>
-#include <string>
-#include "xml2_utils.h"
+
 
 /* * *
  * Author: Nick Wellnhofer <wellnhofer@aevum.de>
@@ -20,21 +16,16 @@ void handleStructuredError(void* userData, const xmlError* error) {
 void handleStructuredError(void* userData, xmlError* error) {
 #endif
 
-  BEGIN_CPP
-  std::string message = std::string(error->message);
-  message.resize(message.size() - 1); // trim off trailing newline
-
+  //std::string message = std::string(error->message);
+  //message.resize(message.size() - 1); // trim off trailing newline
   if (error->level <= 2) {
-    Rf_warning("%s [%i]", message.c_str(), (int) error->code);
+    Rf_warning("%s [%i]", error->message, (int) error->code);
   } else {
-    Rf_error("%s [%i]", message.c_str(), (int) error->code);
+    Rf_error("%s [%i]", error->message, (int) error->code);
   }
-  END_CPP
-
 }
 
-void handleGenericError(void *ctx, const char *fmt, ...)
-{
+void handleGenericError(void *ctx, const char *fmt, ...){
   char buffer[BUFSIZ];
   va_list arg;
 
@@ -45,26 +36,12 @@ void handleGenericError(void *ctx, const char *fmt, ...)
   Rf_error("%s", buffer);
 }
 
-// [[export]]
-extern "C" SEXP init_libxml2() {
+void init_libxml2_library() {
   // Check that header and libs are compatible
   LIBXML_TEST_VERSION
 
   xmlInitParser();
   xmlSetStructuredErrorFunc(NULL, handleStructuredError);
   xmlSetGenericErrorFunc(NULL, handleGenericError);
-
-  return R_NilValue;
 }
 
-extern "C" {
-  void R_unload_xml2(DllInfo *info) {
-    xmlCleanupParser();
-  }
-
-}
-
-// [[export]]
-extern "C" SEXP libxml2_version_(){
-  return Rf_mkString(LIBXML_DOTTED_VERSION);
-}

src/xml2_namespace.cpp

@@ -72,3 +72,8 @@ extern "C" SEXP ns_lookup(SEXP doc_sxp, SEXP node_sxp, SEXP prefix_sxp) {
   return SEXP(out);
   END_CPP
 }
+
+// [[export]]
+extern "C" SEXP libxml2_version_(){
+  return Rf_mkString(LIBXML_DOTTED_VERSION);
+}