Changeset 1232

Timestamp:

15/04/09 10:31:52 (3 years ago)

Author:

Freddie Akeroyd

Message:

Fix bug in NXXgetinfo for NX_CHAR. Refs #174.

Location:

trunk/src

Files:

• nxio.c (modified) (2 diffs)
• nxxml.c (modified) (1 diff)

trunk/src/nxio.c

@@ -228 +228 @@
  actual stuff for implementing the callback functions
  =====================================================================*/
+
+/*
+ * if passed NX_CHAR, then returns dimension of -1 and the caller
+ * needs to do a strlen() or equivalent 
+ */
 void analyzeDim(const char *typeString, int *rank, 
                             int *iDim, int *type){
@@ -252 +257 @@
       break;
     case NX_CHAR:
-      iDim[0] = -1;
+      iDim[0] = -1;     /* length unknown, caller needs to determine later */
       break;
     default:

trunk/src/nxxml.c

@@ -939 +939 @@
       *iType = translateTypeCode(attr);
       analyzeDim(attr,rank,dimension,iType);
+      if (dimension[0] == -1) /* 1D strings are NX_CHAR not NX_CHAR[] so length will not be correct */
+      {
+        dimension[0] = strlen(userData->value.opaque);
+      }
+      
     }
   } else {