Skip to content

Fix compile warnings in cbson with c90 #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2014
Merged

Fix compile warnings in cbson with c90 #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1aae72
Fix compile warnings on C90
estolfo Sep 8, 2014
50f6334
Change repeat probes in mongo_config
estolfo Sep 8, 2014
1815d15
Fix more compile warnings on c90 in cbson
estolfo Sep 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions ext/cbson/cbson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include "ruby.h"
#include "version.h"
#include <arpa/inet.h>

/* Ensure compatibility with early releases of Ruby 1.8.5 */
#ifndef RSTRING_PTR
Expand Down Expand Up @@ -115,7 +116,7 @@ struct deserialize_opts {
#define STR_NEW(p,n) \
({ \
VALUE _str = rb_enc_str_new((p), (n), rb_utf8_encoding()); \
rb_encoding* internal_encoding = rb_default_internal_encoding(); \
rb_encoding* internal_encoding = rb_default_internal_encoding();\
if (internal_encoding) { \
_str = rb_str_export_to_enc(_str, internal_encoding); \
} \
Expand Down Expand Up @@ -167,11 +168,11 @@ static void write_utf8(bson_buffer_t buffer, VALUE string, int allow_null) {
}
#define FREE_INTSTRING(buffer) free(buffer)
#else
#define INT2STRING(buffer, i) \
{ \
#define INT2STRING(buffer, i) \
{ \
int vslength = snprintf(NULL, 0, "%d", i) + 1; \
*buffer = malloc(vslength); \
snprintf(*buffer, vslength, "%d", i); \
*buffer = malloc(vslength); \
snprintf(*buffer, vslength, "%d", i); \
}
#define FREE_INTSTRING(buffer) free(buffer)
#endif
Expand Down Expand Up @@ -435,10 +436,10 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
const char* cls = rb_obj_classname(value);
if (strcmp(cls, "BSON::Binary") == 0 ||
strcmp(cls, "ByteBuffer") == 0) {
const char subtype = strcmp(cls, "ByteBuffer") ?
(const char)FIX2INT(rb_funcall(value, rb_intern("subtype"), 0)) : 2;
VALUE string_data = rb_funcall(value, rb_intern("to_s"), 0);
int length = RSTRING_LENINT(string_data);
const char subtype = strcmp(cls, "ByteBuffer") ?
(const char)FIX2INT(rb_funcall(value, rb_intern("subtype"), 0)) : 2;
write_name_and_type(buffer, key, 0x05);
if (subtype == 2) {
const int other_length = length + 4;
Expand All @@ -453,8 +454,8 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
break;
}
if (strcmp(cls, "BSON::ObjectId") == 0) {
VALUE as_array = rb_funcall(value, rb_intern("to_a"), 0);
int i;
VALUE as_array = rb_funcall(value, rb_intern("to_a"), 0);
write_name_and_type(buffer, key, 0x07);
for (i = 0; i < 12; i++) {
char byte = (char)FIX2INT(rb_ary_entry(as_array, i));
Expand Down Expand Up @@ -658,9 +659,10 @@ static void write_doc(bson_buffer_t buffer, VALUE hash, VALUE check_keys, VALUE

// we have to check for an OrderedHash and handle that specially
if (strcmp(rb_obj_classname(hash), "BSON::OrderedHash") == 0) {
VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);
int i;
for(i = 0; i < RARRAY_LEN(keys); i++) {
VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);

for(i = 0; i < RARRAY_LEN(keys); i++) {
VALUE key = rb_ary_entry(keys, i);
VALUE value = rb_hash_aref(hash, key);

Expand Down Expand Up @@ -739,10 +741,11 @@ static VALUE get_value(const char* buffer, int* position,
int size;
memcpy(&size, buffer + *position, 4);
if (strcmp(buffer + *position + 5, "$ref") == 0) { // DBRef
int offset = *position + 10;
VALUE argv[2];
int collection_length = *(int*)(buffer + offset) - 1;
unsigned char id_type;
int offset = *position + 10;
int collection_length = *(int*)(buffer + offset) - 1;

offset += 4;

argv[0] = STR_NEW(buffer + offset, collection_length);
Expand All @@ -766,9 +769,9 @@ static VALUE get_value(const char* buffer, int* position,

value = rb_ary_new();
while (*position < end) {
VALUE to_append;
unsigned char type = (unsigned char)buffer[(*position)++];
int key_size = (int)strlen(buffer + *position);
VALUE to_append;

*position += key_size + 1; // just skip the key, they're in order.
to_append = get_value(buffer, position, type, opts);
Expand Down Expand Up @@ -847,11 +850,11 @@ static VALUE get_value(const char* buffer, int* position,
int pattern_length = (int)strlen(buffer + *position);
VALUE pattern = STR_NEW(buffer + *position, pattern_length);
int flags_length;
VALUE argv[3];
VALUE argv[3], flags_str;
*position += pattern_length + 1;

flags_length = (int)strlen(buffer + *position);
VALUE flags_str = STR_NEW(buffer + *position, flags_length);
flags_str = STR_NEW(buffer + *position, flags_length);
argv[0] = pattern;
argv[1] = flags_str;
value = rb_class_new_instance(2, argv, BSONRegex);
Expand Down Expand Up @@ -951,13 +954,13 @@ static VALUE get_value(const char* buffer, int* position,
}

static VALUE elements_to_hash(const char* buffer, int max, struct deserialize_opts * opts) {
VALUE hash = rb_class_new_instance(0, NULL, OrderedHash);
int position = 0;
VALUE hash = rb_class_new_instance(0, NULL, OrderedHash);
while (position < max) {
VALUE value;
unsigned char type = (unsigned char)buffer[position++];
int name_length = (int)strlen(buffer + position);
VALUE name = STR_NEW(buffer + position, name_length);
VALUE value;
position += name_length + 1;
value = get_value(buffer, &position, type, opts);
rb_funcall(hash, element_assignment_method, 2, name, value);
Expand All @@ -969,6 +972,7 @@ static VALUE method_deserialize(VALUE self, VALUE bson, VALUE opts) {
const char* buffer = RSTRING_PTR(bson);
int remaining = RSTRING_LENINT(bson);
struct deserialize_opts deserialize_opts;

deserialize_opts.compile_regex = 1;
if (rb_funcall(opts, rb_intern("has_key?"), 1, ID2SYM(rb_intern("compile_regex"))) == Qtrue &&
rb_hash_aref(opts, ID2SYM(rb_intern("compile_regex"))) == Qfalse) {
Expand Down
2 changes: 1 addition & 1 deletion test/tools/mongo_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ def repl_set_startup
states = nil
healthy = false

60.times do
80.times do
# enter the thunderdome...
states = repl_set_get_status.zip(repl_set_is_master)
healthy = states.all? do |status, is_master|
Expand Down