Changes for miniexpr compatibility

Author: lshaw8317

blosc/blosc2.c

@@ -68,7 +68,7 @@
 #include <sys/types.h>
 #include <assert.h>
 #include <math.h>
-
+#include <stdint.h>
 
 /* Synchronization variables */
 
@@ -946,11 +946,14 @@ uint8_t* pipeline_forward(struct thread_context* thread_context, const int32_t b
   uint8_t* filters = context->filters;
   uint8_t* filters_meta = context->filters_meta;
   bool memcpyed = context->header_flags & (uint8_t)BLOSC_MEMCPYED;
-
+  bool output_is_disposable = (context->preparams != NULL) ? context->preparams->output_is_disposable : false;
+  
   /* Prefilter function */
   if (context->prefilter != NULL) {
     /* Set unwritten values to zero */
-    memset(_dest, 0, bsize);
+    if (!output_is_disposable) {
+      memset(_dest, 0, bsize);
+    }
     // Create new prefilter parameters for this block (must be private for each thread)
     blosc2_prefilter_params preparams;
     memcpy(&preparams, context->preparams, sizeof(preparams));
@@ -965,8 +968,14 @@ uint8_t* pipeline_forward(struct thread_context* thread_context, const int32_t b
     preparams.ttmp = thread_context->tmp;
     preparams.ttmp_nbytes = thread_context->tmp_nbytes;
     preparams.ctx = context;
+    preparams.output_is_disposable = output_is_disposable;
 
     if (context->prefilter(&preparams) != 0) {
+      if (output_is_disposable) {
+        // Output is going to be discarded; no more filters are required
+        BLOSC_TRACE_INFO("Output is disposable");
+        return _dest;
+      }
       BLOSC_TRACE_ERROR("Execution of prefilter function failed");
       return NULL;
     }
@@ -1087,6 +1096,7 @@ static int blosc_c(struct thread_context* thread_context, int32_t bsize,
   int32_t ctbytes = 0;              /* number of compressed bytes in block */
   int32_t maxout;
   int32_t typesize = context->typesize;
+  bool output_is_disposable = (context->preparams != NULL) ? context->preparams->output_is_disposable : false;
   const char* compname;
   int accel;
   const uint8_t* _src;
@@ -1149,6 +1159,13 @@ static int blosc_c(struct thread_context* thread_context, int32_t bsize,
       ntbytes += sizeof(int32_t);
       ctbytes += sizeof(int32_t);
 
+      if (context->header_overhead == BLOSC_EXTENDED_HEADER_LENGTH && output_is_disposable) {
+        // Simulate a run of 0s
+        BLOSC_TRACE_INFO("Output is disposable, simulating a run of 0s");
+        memset(dest - 4, 0, sizeof(int32_t));
+        continue;
+      }
+
       const uint8_t *ip = (uint8_t *) _src + j * neblock;
       const uint8_t *ipbound = (uint8_t *) _src + (j + 1) * neblock;
 

blosc/directories.c

@@ -21,6 +21,7 @@
   #include <windows.h>
   #include <malloc.h>
   #include <io.h>
+  #include <direct.h>   /* <- add this for _rmdir */
 
   int blosc2_remove_dir(const char* dir_path) {
     char* path;
@@ -62,7 +63,12 @@
       free(fname);
     }
 
-    rmdir(dir_path);
+    /* remove the directory */
+    if (_rmdir(dir_path) != 0) {
+      BLOSC_TRACE_ERROR("Could not remove directory %s (errno=%d)", dir_path, errno);
+      _findclose(file);
+      return BLOSC2_ERROR_FAILURE;
+    }
     _findclose(file);
     return BLOSC2_ERROR_SUCCESS;
   }

include/blosc2.h

@@ -1111,6 +1111,7 @@ typedef struct {
   uint8_t *ttmp;  // a temporary that is able to hold several blocks for the output and is private for each thread
   size_t ttmp_nbytes;  // the size of the temporary in bytes
   blosc2_context *ctx;  // the compression context
+  bool output_is_disposable;  // whether the output buffer is disposable
 } blosc2_prefilter_params;
 
 /**