Merge pull request #754 from larskanis/rb_len_t

Make use of new data type for lengths in ruby-4.1+

Author: larskanis

ext/pg.h

@@ -80,6 +80,11 @@ typedef long suseconds_t;
 #define rb_hash_new_capa(x) rb_hash_new()
 #endif
 
+#ifndef HAVE_RB_LEN_T
+typedef long rb_len_t;
+typedef unsigned long rb_ulen_t;
+#endif
+
 #define pg_gc_location(x) x = rb_gc_location(x)
 
 extern int ruby_native_thread_p(void);

ext/pg_binary_decoder.c

@@ -275,12 +275,12 @@ pg_bin_dec_array(t_pg_coder *conv, const char *input_line, int len, int tuple, i
 	}
 
 	if (cur_ptr < line_end_ptr)
-		rb_raise( rb_eArgError, "trailing data after binary array data at position: %ld", (long)(cur_ptr - input_line) + 1 );
+		rb_raise( rb_eArgError, "trailing data after binary array data at position: %lld", (long long)(cur_ptr - input_line) + 1 );
 
 	return arrays[0];
 
 length_error:
-	rb_raise( rb_eArgError, "premature end of binary array data at position: %ld", (long)(cur_ptr - input_line) + 1 );
+	rb_raise( rb_eArgError, "premature end of binary array data at position: %lld", (long long)(cur_ptr - input_line) + 1 );
 }
 
 #define PG_INT64_MIN	(-0x7FFFFFFFFFFFFFFFL - 1)

ext/pg_copy_coder.c

@@ -692,7 +692,7 @@ pg_text_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tup
 		}
 
 		if (!found_delim && cur_ptr < line_end_ptr)
-			rb_raise( rb_eArgError, "trailing data after linefeed at position: %ld", (long)(cur_ptr - input_line) + 1 );
+			rb_raise( rb_eArgError, "trailing data after linefeed at position: %lld", (long long)(cur_ptr - input_line) + 1 );
 
 
 		/* Check whether raw input matched null marker */
@@ -881,13 +881,13 @@ pg_bin_dec_copy_row(t_pg_coder *conv, const char *input_line, int len, int _tupl
 	}
 
 	if (cur_ptr < line_end_ptr)
-		rb_raise( rb_eArgError, "trailing data after row data at position: %ld", (long)(cur_ptr - input_line) + 1 );
+		rb_raise( rb_eArgError, "trailing data after row data at position: %lld", (long long)(cur_ptr - input_line) + 1 );
 
 	RB_GC_GUARD(rb_typemap);
 	return array;
 
 length_error:
-	rb_raise( rb_eArgError, "premature end of COPY data at position: %ld", (long)(cur_ptr - input_line) + 1 );
+	rb_raise( rb_eArgError, "premature end of COPY data at position: %lld", (long long)(cur_ptr - input_line) + 1 );
 }
 
 void

ext/pg_record_coder.c

@@ -198,7 +198,7 @@ pg_text_enc_record(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate
 	for( i=0; i<RARRAY_LEN(value); i++){
 		char *ptr1;
 		char *ptr2;
-		long strlen;
+		rb_len_t strlen;
 		int backslashes;
 		VALUE subint;
 		VALUE entry;

ext/pg_text_decoder.c

@@ -103,7 +103,7 @@ pg_text_dec_string(t_pg_coder *conv, const char *val, int len, int tuple, int fi
 static VALUE
 pg_text_dec_integer(t_pg_coder *conv, const char *val, int len, int tuple, int field, int enc_idx)
 {
-	long i;
+	rb_len_t i;
 	int max_len;
 
 	if( sizeof(i) >= 8 && FIXNUM_MAX >= 1000000000000000000LL ){

ext/pg_text_encoder.c

@@ -430,7 +430,7 @@ pg_text_enc_bytea(t_pg_coder *conv, VALUE value, char *out, VALUE *intermediate,
 		}
 		return (int)(optr - out);
 	}else{
-		long size;
+		rb_len_t size;
 		*intermediate = rb_obj_as_string(value);
 		size = RSTRING_LEN(*intermediate);
 
@@ -653,8 +653,8 @@ quote_identifier( VALUE value, VALUE out_string, char *current_out ){
 static char *
 pg_text_enc_array_identifier(VALUE value, VALUE string, char *out, int enc_idx)
 {
-	long i;
-	long nr_elems;
+	rb_len_t i;
+	rb_len_t nr_elems;
 
 	Check_Type(value, T_ARRAY);
 	nr_elems = RARRAY_LEN(value);

ext/pg_tuple.c

@@ -253,7 +253,7 @@ static VALUE
 pg_tuple_fetch(int argc, VALUE *argv, VALUE self)
 {
 	VALUE key;
-	long block_given;
+	int block_given;
 	VALUE index;
 	int field_num;
 	t_pg_tuple *this = pg_tuple_get_this(self);

ext/pg_type_map_by_class.c

@@ -27,7 +27,7 @@ typedef struct {
  * We use 8 Bits of the klass object id as index to a 256 entry cache.
  * This avoids full lookups in most cases.
  */
-#define CACHE_LOOKUP(this, klass) ( &this->cache_row[(((unsigned long)klass) >> 8) & 0xff] )
+#define CACHE_LOOKUP(this, klass) ( &this->cache_row[(((unsigned int)klass) >> 8) & 0xff] )
 
 
 static t_pg_coder *

ext/pg_type_map_by_column.c

@@ -263,7 +263,7 @@ pg_tmbc_allocate(void)
 static VALUE
 pg_tmbc_init(VALUE self, VALUE conv_ary)
 {
-	long i;
+	int i;
 	t_tmbc *this;
 	int conv_ary_len;
 

ext/pg_util.c

@@ -22,10 +22,10 @@ rbpg_base64_encode( char *out, const char *in, int len)
 	int part_len = len % 3;
 
 	if( part_len > 0 ){
-		long byte2 = 0;
-		long byte1 = part_len > 1 ? *--in_ptr : 0;
-		long byte0 = *--in_ptr;
-		long triple = (byte0 << 16) + (byte1 << 8) + byte2;
+		int byte2 = 0;
+		int byte1 = part_len > 1 ? *--in_ptr : 0;
+		int byte0 = *--in_ptr;
+		int triple = (byte0 << 16) + (byte1 << 8) + byte2;
 
 		*--out_ptr = '=';
 		*--out_ptr = part_len > 1 ? base64_encode_table[(triple >> 1 * 6) & 0x3F] : '=';
@@ -34,10 +34,10 @@ rbpg_base64_encode( char *out, const char *in, int len)
 	}
 
 	while( out_ptr > out ){
-		long byte2 = *--in_ptr;
-		long byte1 = *--in_ptr;
-		long byte0 = *--in_ptr;
-		long triple = (byte0 << 16) + (byte1 << 8) + byte2;
+		int byte2 = *--in_ptr;
+		int byte1 = *--in_ptr;
+		int byte0 = *--in_ptr;
+		int triple = (byte0 << 16) + (byte1 << 8) + byte2;
 
 		*--out_ptr = base64_encode_table[(triple >> 0 * 6) & 0x3F];
 		*--out_ptr = base64_encode_table[(triple >> 1 * 6) & 0x3F];