Changeset 1787 for trunk

Timestamp:

09/12/11 09:47:24 (6 months ago)

Author:

Freddie Akeroyd

Message:

Write a single space for empty strings (rather than an empty node) - this is
to avoid a read error (no userData) when converting back to e.g. HDF5. Refs #314

File:

• trunk/src/nxxml.c (modified) (6 diffs)

trunk/src/nxxml.c

@@ -357 +357 @@
 NXstatus  NXXclosegroup (NXhandle fid){
   pXMLNexus xmlHandle = NULL;
-  mxml_node_t *newGroup = NULL;
 
   xmlHandle = (pXMLNexus)fid;
@@ -750 +749 @@
   pNXDS dataset;
   int i, offset, length;
-  char *pPtr = NULL;
   xmlHandle = (pXMLNexus)fid;
   assert(xmlHandle);
@@ -818 +816 @@
         length *= dim[i];
       }
-      pPtr = (char *)malloc((length+1)*sizeof(char));
-      if(pPtr != NULL){
-        memcpy(pPtr,data,length);
-        pPtr[length] = '\0';
-        mxmlSetOpaque(userData,(const char *)pPtr);
-        free(pPtr);
+      /* we seem to have trouble reading an empty node back (no userData), so make sure we have at least a single space present even for empty strings */
+      if (length == 0)
+      {
+        mxmlSetOpaque(userData," ");
+      }
+      else
+      {
+        pPtr = (char *)malloc((length+1)*sizeof(char));
+        if(pPtr != NULL){
+          memcpy(pPtr,data,length);
+          pPtr[length] = '\0';
+          mxmlSetOpaque(userData,(const char *)pPtr);
+          free(pPtr);
+        }
       }
     }
@@ -985 +991 @@
   the addressing and type conversion implemented in nxdataset
 ---------------------------------------------------------------------*/ 
-static pNXDS makeSlabData(pNXDS dataset, void *data, int64_t size[]){
+static pNXDS makeSlabData(pNXDS dataset, void *data, const int64_t size[]){
   pNXDS slabData = NULL;
   int rank, i;
@@ -1125 +1131 @@
 ----------------------------------------------------------------------*/
 static void getSlabData(pNXDS dataset, pNXDS slabData, int dim,
-                        int64_t start[], 
+                        const int64_t start[], 
                         int64_t sourcePos[],int64_t targetPos[]){
   int64_t i, rank, length;
@@ -1777 +1783 @@
   int stackPtr;
   mxml_node_t *current = NULL;
-  char *pathString = NULL, *result = NULL;
+  char *result = NULL;
 
   path = (mxml_node_t **)malloc(NXMAXSTACK*sizeof(mxml_node_t *));