[Teem-commit] SF.net SVN: teem:[5156] teem/trunk/src/nrrd/methodsNrrd.c

[<kin...@us...>]

Revision: 5156
          http://teem.svn.sourceforge.net/teem/?rev=5156&view=rev
Author:   kindlmann
Date:     2011-11-28 16:35:11 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
now using airPtrPtrUnion

Modified Paths:
--------------
    teem/trunk/src/nrrd/methodsNrrd.c

Modified: teem/trunk/src/nrrd/methodsNrrd.c
===================================================================
--- teem/trunk/src/nrrd/methodsNrrd.c	2011-11-28 16:29:17 UTC (rev 5155)
+++ teem/trunk/src/nrrd/methodsNrrd.c	2011-11-28 16:35:11 UTC (rev 5156)
@@ -115,6 +115,8 @@
   
   nio = (NrrdIoState *)calloc(1, sizeof(NrrdIoState));
   if (nio) {
+    airPtrPtrUnion appu;
+
     nio->path = NULL;
     nio->base = NULL;
     nio->line = NULL;
@@ -122,7 +124,8 @@
     nio->dataFN = NULL;
     nio->headerStringRead = NULL;
     nio->headerStringWrite = NULL;
-    nio->dataFNArr = airArrayNew((void**)(&(nio->dataFN)), NULL, 
+    appu.cp = &(nio->dataFN);
+    nio->dataFNArr = airArrayNew(appu.v, NULL, 
                                  sizeof(char *), NRRD_FILENAME_INCR);
     airArrayPointerCB(nio->dataFNArr, airNull, airFree);
     nio->format = nrrdFormatUnknown;
@@ -476,6 +479,7 @@
 nrrdNew(void) {
   int ii;
   Nrrd *nrrd;
+  airPtrPtrUnion appu;
   
   nrrd = (Nrrd*)(calloc(1, sizeof(Nrrd)));
   if (!nrrd) {
@@ -496,8 +500,8 @@
 
   /* create comment airArray (even though it starts empty) */
   nrrd->cmt = NULL;
-  nrrd->cmtArr = airArrayNew((void**)(&(nrrd->cmt)), NULL, 
-                             sizeof(char *), NRRD_COMMENT_INCR);
+  appu.cp = &(nrrd->cmt);
+  nrrd->cmtArr = airArrayNew(appu.v, NULL, sizeof(char *), NRRD_COMMENT_INCR);
   if (!nrrd->cmtArr) {
     return NULL;
   }
@@ -505,7 +509,8 @@
 
   /* create key/value airArray (even thought it starts empty) */
   nrrd->kvp = NULL;
-  nrrd->kvpArr = airArrayNew((void**)(&(nrrd->kvp)), NULL, 
+  appu.cp = &(nrrd->kvp);
+  nrrd->kvpArr = airArrayNew(appu.v, NULL,
                              2*sizeof(char *), NRRD_KEYVALUE_INCR);
   if (!nrrd->kvpArr) {
     return NULL;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.