nifti_image_write_bricks_status

Author: afni-rickr

nifti2/nifti2_io.c

@@ -8018,16 +8018,7 @@ znzFile nifti_write_ascii_image(nifti_image *nim, const nifti_brick_list * NBL,
 *//*------------------------------------------------------------------------*/
 void nifti_image_write( nifti_image *nim )
 {
-   znzFile fp=NULL;
-   int     rv;
-
-   rv = nifti_image_write_engine(nim, 1, "wb", &fp, NULL);
-   if( fp ){
-      if( g_opts.debug > 2 ) fprintf(stderr,"-d niw: done with znzFile\n");
-      free(fp);
-   }
-   if( g_opts.debug > 1 )
-      fprintf(stderr,"-d nifti_image_write: done, status %d\n", rv);
+   (void)nifti_image_write_status(nim);
 }
 
 
@@ -8048,25 +8039,51 @@ int nifti_image_write_status( nifti_image *nim )
    int     rv;
 
    rv = nifti_image_write_engine(nim, 1, "wb", &fp, NULL);
+
+   if( fp ){ /* this should not happen, as we requested file closure */
+      if( g_opts.debug > 2 ) fprintf(stderr,"-d niw: done with znzFile\n");
+      free(fp);
+   }
    if( g_opts.debug > 1 )
       fprintf(stderr,"-d nifti_image_write_status: done, status %d\n", rv);
+
    return rv;
 }
 
 
 /*----------------------------------------------------------------------*/
-/*! similar to nifti_image_write, but data is in NBL struct, not nim->data
+/*! similar to nifti_image_write_status, but data is in NBL struct,
+    not nim->data
+
+   \return 0 on success, 1 on error
 
    \sa nifti_image_write, nifti_image_free, nifti_set_filenames, nifti_free_NBL
 *//*--------------------------------------------------------------------*/
-void nifti_image_write_bricks( nifti_image *nim, const nifti_brick_list * NBL )
+int nifti_image_write_bricks_status( nifti_image *nim,
+                                     const nifti_brick_list * NBL )
 {
-   znzFile fp = nifti_image_write_hdr_img2(nim,1,"wb",NULL,NBL);
+   znzFile fp=NULL;
+   int     rv;
+
+   rv = nifti_image_write_engine(nim, 1, "wb", &fp, NBL);
    if( fp ){
       if( g_opts.debug > 2 ) fprintf(stderr,"-d niwb: done with znzFile\n");
       free(fp);
    }
-   if( g_opts.debug > 1 ) fprintf(stderr,"-d niwb: done writing bricks\n");
+   if( g_opts.debug > 1 )
+      fprintf(stderr,"-d niwb: done writing bricks, status %d\n", rv);
+   return rv;
+}
+
+
+/*----------------------------------------------------------------------*/
+/*! similar to nifti_image_write, but data is in NBL struct, not nim->data
+
+   \sa nifti_image_write, nifti_image_free, nifti_set_filenames, nifti_free_NBL
+*//*--------------------------------------------------------------------*/
+void nifti_image_write_bricks( nifti_image *nim, const nifti_brick_list * NBL )
+{
+   (void)nifti_image_write_bricks_status(nim, NBL);
 }
 
 

nifti2/nifti2_io.h

@@ -448,6 +448,8 @@ int          nifti_image_write_status( nifti_image *nim ) ;  /* 7 Jun 2022 */
 
 void         nifti_image_write_bricks(nifti_image * nim,
                                       const nifti_brick_list * NBL);
+int          nifti_image_write_bricks_status(nifti_image * nim,
+                                             const nifti_brick_list * NBL);
 void         nifti_image_infodump( const nifti_image * nim ) ;
 
 void         nifti_disp_lib_hist( int ver ) ;  /* to display library history */

nifti2/nifti_tool.c

@@ -7123,14 +7123,16 @@ int act_cbl( nt_opts * opts )
 
    /* and finally, write out results */
    if( err == 0 && nifti_nim_is_valid(nim, g_debug) )
-      nifti_image_write_bricks(nim, &NBL);
+      if( nifti_image_write_bricks_status(nim, &NBL) ) {
+         err++;
+      }
 
    nifti_image_free(nim);
    nifti_free_NBL(&NBL);
    free(fname);
    free(selstr);
 
-   return 0;
+   return err;
 }
 
 

niftilib/nifti1_io.c

@@ -5947,18 +5947,35 @@ int nifti_image_write_status( nifti_image *nim )
 /*----------------------------------------------------------------------*/
 /*! similar to nifti_image_write, but data is in NBL struct, not nim->data
 
-   \return 0 on success, -1 on error
+   \return 0 on success, 1 on error
 
    \sa nifti_image_write, nifti_image_free, nifti_set_filenames, nifti_free_NBL
 *//*--------------------------------------------------------------------*/
-void nifti_image_write_bricks( nifti_image *nim, const nifti_brick_list * NBL )
+int nifti_image_write_bricks_status( nifti_image *nim,
+                                     const nifti_brick_list * NBL )
 {
-   znzFile fp = nifti_image_write_hdr_img2(nim,1,"wb",NULL,NBL);
+   znzFile fp=NULL;
+   int     rv;
+
+   rv = nifti_image_write_engine(nim, 1, "wb", &fp, NBL);
    if( fp ){
       if( g_opts.debug > 2 ) fprintf(stderr,"-d niwb: done with znzFile\n");
       free(fp);
    }
-   if( g_opts.debug > 1 ) fprintf(stderr,"-d niwb: done writing bricks\n");
+   if( g_opts.debug > 1 )
+      fprintf(stderr,"-d niwb: done writing bricks, status %d\n", rv);
+   return rv;
+}
+
+
+/*----------------------------------------------------------------------*/
+/*! similar to nifti_image_write, but data is in NBL struct, not nim->data
+
+   \sa nifti_image_write, nifti_image_free, nifti_set_filenames, nifti_free_NBL
+*//*--------------------------------------------------------------------*/
+void nifti_image_write_bricks( nifti_image *nim, const nifti_brick_list * NBL )
+{
+   (void)nifti_image_write_bricks_status(nim, NBL);
 }
 
 

niftilib/nifti1_io.h

@@ -303,6 +303,8 @@ int          nifti_image_write_status( nifti_image *nim );
 
 void         nifti_image_write_bricks(nifti_image * nim,
                                       const nifti_brick_list * NBL);
+int          nifti_image_write_bricks_status(nifti_image * nim,
+                                             const nifti_brick_list * NBL);
 void         nifti_image_infodump( const nifti_image * nim ) ;
 
 void         nifti_disp_lib_hist( void ) ;     /* to display library history */