[GNUnet-SVN] [libfints] branch master updated: Enable INI generation in tests.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository libfints.

The following commit(s) were added to refs/heads/master by this push:
     new 14a9a07  Enable INI generation in tests.
14a9a07 is described below

commit 14a9a07c320e710e3ce0f8a27d82329bbfc3e650
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Oct 12 15:58:31 2018 +0200

    Enable INI generation in tests.
    
    Fails, namely the base XML document passed to the
    parser is wrong.
---
 src/libebics.c |  2 +-
 src/libebics.h |  2 ++
 src/tests.c    |  4 ++--
 src/xmlproto.c | 35 +++++++++++++++++++++++------------
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/libebics.c b/src/libebics.c
index 3055fad..6038f05 100644
--- a/src/libebics.c
+++ b/src/libebics.c
@@ -626,7 +626,7 @@ EBICS_init_library (const char *key_dir,
                     const char *key_files[])
 {
   int retv;
-
+  
   /**
    * Directory where XML templates are stored.
    */
diff --git a/src/libebics.h b/src/libebics.h
index 0bb3e14..2dc7322 100644
--- a/src/libebics.h
+++ b/src/libebics.h
@@ -35,6 +35,8 @@
 #define EBICS_KEY_MAX_ENTRIES 6
 #define EBICS_KEY_MAX_NAME 128
 
+
+/* FIXME verify that this is _actually_ it! */
 #define EBICS_INI_BASE_DOCUMENT 0
 
 /**
diff --git a/src/tests.c b/src/tests.c
index 0f0244e..76885b1 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -74,8 +74,8 @@ main (int argc,
     return EBICS_ERROR;
   }
 
-  // EBICS_generate_message_ini (header_args,
-  //                             ini_args);
+  EBICS_generate_message_ini (&header_args,
+                              &ini_args);
   
   EBICS_close_library ();
   
diff --git a/src/xmlproto.c b/src/xmlproto.c
index 4521f5f..431e5dc 100644
--- a/src/xmlproto.c
+++ b/src/xmlproto.c
@@ -473,22 +473,33 @@ process_unique (const struct EBICS_MSG_Spec *operation,
                 struct EBICS_genex_document *document)
 {
 
-  xmlXPathContextPtr xpathCtxPtr = document->xpath;
-  xmlDocPtr doc = document->document;
-  xmlXPathObjectPtr xpathObjPtr = xmlXPathEvalExpression
+  xmlXPathContextPtr xpathCtxPtr;
+  xmlDocPtr doc;
+  xmlXPathObjectPtr xpathObjPtr; 
+  xmlNodeSetPtr nodeset;
+  xmlNodePtr node;
+
+  xpathCtxPtr = document->xpath;
+  doc = document->document;
+
+  xpathObjPtr = xmlXPathEvalExpression
     (BAD_CAST operation->xpath,
      xpathCtxPtr);
-  assert(NULL != xpathObjPtr);
-  assert(NULL != xpathObjPtr->nodesetval);
-  xmlNodeSetPtr nodeset = xpathObjPtr->nodesetval;
-  assert(1 == nodeset->nodeNr);
-  xmlNodePtr node = nodeset->nodeTab[0];
-  xmlXPathFreeObject(xpathObjPtr);
 
-  while (node && node != xmlDocGetRootElement(doc))
+  assert (NULL != xpathObjPtr);
+  assert (NULL != xpathObjPtr->nodesetval);
+
+  nodeset = xpathObjPtr->nodesetval;
+  assert (1 == nodeset->nodeNr);
+  node = nodeset->nodeTab[0];
+  xmlXPathFreeObject (xpathObjPtr);
+
+  while (node && node != xmlDocGetRootElement (doc))
   {
-    LOG(EBICS_LOGLEVEL_INFO,"process_unique: Relinking %s", node->name);
-    node = relink_choice(node, doc);
+    LOG (EBICS_LOGLEVEL_INFO,
+         "process_unique: Relinking %s",
+         node->name);
+    node = relink_choice (node, doc);
   }
 }
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden