Test dev for Windows build

WizardMac · Jun 15, 2024 · 815d40d · 815d40d
1 parent 213a76a
commit 815d40d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 309 deletions.
diff --git a/src/readstat.h b/src/readstat.h
@@ -104,22 +104,11 @@ typedef enum readstat_error_e {
     READSTAT_ERROR_TOO_FEW_COLUMNS,
     READSTAT_ERROR_TOO_MANY_COLUMNS,
     READSTAT_ERROR_NAME_IS_ZERO_LENGTH,
-    READSTAT_ERROR_BAD_TIMESTAMP_VALUE,
-    READSTAT_ERROR_BAD_MR_STRING
+    READSTAT_ERROR_BAD_TIMESTAMP_VALUE
 } readstat_error_t;
 
 const char *readstat_error_message(readstat_error_t error_code);
 
-typedef struct mr_set_s {
-    char   type;
-    char  *name;
-    char  *label;
-    int    is_dichotomy;
-    int    counted_value;
-    char **subvariables;
-    int    num_subvars;
-} mr_set_t;
-
 typedef struct readstat_metadata_s {
     int64_t     row_count;
     int64_t     var_count;
@@ -132,8 +121,6 @@ typedef struct readstat_metadata_s {
     const char *file_label;
     const char *file_encoding;
     unsigned int is64bit:1;
-    size_t multiple_response_sets_length;
-    mr_set_t *mr_sets;
 } readstat_metadata_t;
 
 /* If the row count is unknown (e.g. it's an XPORT or POR file, or an SAV
@@ -151,8 +138,6 @@ readstat_endian_t readstat_get_endianness(readstat_metadata_t *metadata);
 const char *readstat_get_table_name(readstat_metadata_t *metadata);
 const char *readstat_get_file_label(readstat_metadata_t *metadata);
 const char *readstat_get_file_encoding(readstat_metadata_t *metadata);
-const mr_set_t *readstat_get_mr_sets(readstat_metadata_t *metadata);
-size_t readstat_get_multiple_response_sets_length(readstat_metadata_t *metadata);
 
 typedef struct readstat_value_s {
     union {

diff --git a/src/readstat_metadata.c b/src/readstat_metadata.c
@@ -43,11 +43,3 @@ const char *readstat_get_file_encoding(readstat_metadata_t *metadata) {
 const char *readstat_get_table_name(readstat_metadata_t *metadata) {
     return metadata->table_name;
 }
-
-size_t readstat_get_multiple_response_sets_length(readstat_metadata_t *metadata) {
-    return metadata->multiple_response_sets_length;
-}
-
-const mr_set_t *readstat_get_mr_sets(readstat_metadata_t *metadata) {
-    return metadata->mr_sets;
-}
diff --git a/src/spss/readstat_sav.c b/src/spss/readstat_sav.c
@@ -59,8 +59,6 @@ sav_ctx_t *sav_ctx_init(sav_file_header_record_t *header, readstat_io_t *io) {
         return NULL;
     }
 
-    ctx->mr_sets = NULL;
-
     ctx->io = io;
 
     return ctx;
@@ -91,25 +89,6 @@ void sav_ctx_free(sav_ctx_t *ctx) {
     if (ctx->variable_display_values) {
         free(ctx->variable_display_values);
     }
-    if (ctx->mr_sets) {
-        for (size_t i = 0; i < ctx->multiple_response_sets_length; i++) {
-            if (ctx->mr_sets[i].name) {
-                free(ctx->mr_sets[i].name);
-            }
-            if (ctx->mr_sets[i].label) {
-                free(ctx->mr_sets[i].label);
-            }
-            if (ctx->mr_sets[i].subvariables) {
-                for (size_t j = 0; j < ctx->mr_sets[i].num_subvars; j++) {
-                    if (ctx->mr_sets[i].subvariables[j]) {
-                        free(ctx->mr_sets[i].subvariables[j]);
-                    }
-                }
-                free(ctx->mr_sets[i].subvariables);
-            }
-        }
-        free(ctx->mr_sets);
-    }
     free(ctx);
 }
 
diff --git a/src/spss/readstat_sav.h b/src/spss/readstat_sav.h
@@ -3,7 +3,6 @@
 //
 
 #include "readstat_spss.h"
-#include "../readstat.h"
 
 #pragma pack(push, 1)
 
@@ -101,9 +100,6 @@ typedef struct sav_ctx_s {
     uint64_t       lowest_double;
     uint64_t       highest_double;
 
-    size_t         multiple_response_sets_length;
-    mr_set_t      *mr_sets;
-
     double         bias;
     int            format_version;
 
@@ -121,7 +117,6 @@ typedef struct sav_ctx_s {
 
 #define SAV_RECORD_SUBTYPE_INTEGER_INFO       3
 #define SAV_RECORD_SUBTYPE_FP_INFO            4
-#define SAV_RECORD_SUBTYPE_MULTIPLE_RESPONSE_SETS 7
 #define SAV_RECORD_SUBTYPE_PRODUCT_INFO      10
 #define SAV_RECORD_SUBTYPE_VAR_DISPLAY       11
 #define SAV_RECORD_SUBTYPE_LONG_VAR_NAME     13