Drop ds->encoding

Author: achaikou

lib/include/segyio/segy.h

@@ -343,11 +343,6 @@ struct segy_datasource {
     /* Is datasource writable */
     bool writable;
 
-    /* EBCDIC or ASCII encoding. All text-reading functions should consult this
-     * property to determine string encoding.
-     */
-    int encoding;
-
     /* Setting for trace algorithms.
      *
      * If true, unnecessary data would be read into memory/written to the

lib/src/segy.c

@@ -787,8 +787,6 @@ segy_file* segy_open( const char* path, const char* mode ) {
     ds->close = fileclose;
     ds->writable = strstr( binary_mode, "+" ) || strstr( binary_mode, "w" );
 
-    ds->encoding = SEGY_EBCDIC;
-
     ds->minimize_requests_number = true;
     ds->memory_speedup = false;
 
@@ -848,8 +846,6 @@ segy_datasource* segy_memopen( unsigned char* addr, size_t size ) {
 
     ds->writable = true;
 
-    ds->encoding = SEGY_EBCDIC;
-
     ds->minimize_requests_number = false;
     ds->memory_speedup = true;
 
@@ -981,7 +977,6 @@ int segy_collect_metrics(
         if( err != SEGY_OK ) return err;
     }
     ds->metrics.encoding = encoding;
-    ds->encoding = encoding;
 
     char binheader[SEGY_BINARY_HEADER_SIZE];
     int err = segy_binheader( ds, binheader );
@@ -2899,7 +2894,7 @@ int segy_read_ext_textheader( segy_datasource* ds, int pos, char *buf) {
     err = ds->read( ds, buf, SEGY_TEXT_HEADER_SIZE );
     if( err != 0 ) return SEGY_DS_READ_ERROR;
 
-    if( ds->encoding == SEGY_EBCDIC ) {
+    if( ds->metrics.encoding == SEGY_EBCDIC ) {
         encode( buf, buf, e2a, SEGY_TEXT_HEADER_SIZE );
     }
 
@@ -2914,7 +2909,7 @@ int segy_write_textheader( segy_datasource* ds, int pos, const char* buf ) {
 
     if( pos < 0 ) return SEGY_INVALID_ARGS;
 
-    if( ds->encoding == SEGY_EBCDIC ) {
+    if( ds->metrics.encoding == SEGY_EBCDIC ) {
         encode( mbuf, buf, a2e, SEGY_TEXT_HEADER_SIZE );
     } else {
         memcpy( mbuf, buf, SEGY_TEXT_HEADER_SIZE );

python/segyio/segyio.cpp

@@ -311,7 +311,6 @@ segy_datasource* create_py_stream_datasource(
 
     ds->memory_speedup = false;
     ds->minimize_requests_number = minimize_requests_number;
-    ds->encoding = SEGY_EBCDIC;
 
     ds->metrics.endianness = SEGY_MSB;
     ds->metrics.encoding = SEGY_EBCDIC;
@@ -680,7 +679,7 @@ PyObject* segycreate( segyfd* self, PyObject* args, PyObject* kwargs ) {
     }
 
     ds->metrics.endianness = endianness;
-    ds->encoding = encoding;
+    ds->metrics.encoding = encoding;
 
     if( samples <= 0 )
         return ValueError( "expected samples > 0" );
@@ -764,7 +763,7 @@ PyObject* suopen( segyfd* self, PyObject* args, PyObject* kwargs ) {
         if( err != SEGY_OK ) return NULL;
     }
     ds->metrics.endianness = endianness;
-    ds->encoding = encoding;
+    ds->metrics.encoding = encoding;
 
     int err = overwrite_mapping( ds, py_iline, py_xline );
     if( err ) return NULL;
@@ -1114,7 +1113,7 @@ PyObject* metrics( segyfd* self ) {
     static const int bin  = SEGY_BINARY_HEADER_SIZE;
     const int ext = (self->trace0 - (text + bin)) / text;
     segy_datasource* ds = self->ds;
-    int encoding = ds->encoding;
+    int encoding = ds->metrics.encoding;
     return Py_BuildValue( "{s:i, s:l, s:i, s:i, s:i, s:i, s:i}",
                           "tracecount",  self->tracecount,
                           "trace0",      self->trace0,