X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=generator%2Fgenerator_ruby.ml;h=84d10e0017668a3286551794649743ffc3d9741a;hb=5776c145d411e5ae00072ecf422055f3d0bd29e2;hp=a2a112aee7aba014fa1e0263b252fb0b7e858956;hpb=e9f25e693e3211b0219d84f956dcd3d164bac9d3;p=libguestfs.git diff --git a/generator/generator_ruby.ml b/generator/generator_ruby.ml index a2a112a..84d10e0 100644 --- a/generator/generator_ruby.ml +++ b/generator/generator_ruby.ml @@ -351,11 +351,7 @@ get_all_event_callbacks (guestfs_h *g, size_t *len_rtn) function | Pathname n | Device n | Dev_or_Path n | String n | Key n | FileIn n | FileOut n -> - pr " Check_Type (%sv, T_STRING);\n" n; pr " const char *%s = StringValueCStr (%sv);\n" n n; - pr " if (!%s)\n" n; - pr " rb_raise (rb_eTypeError, \"expected string for parameter %%s of %%s\",\n"; - pr " \"%s\", \"%s\");\n" n name | BufferIn n -> pr " Check_Type (%sv, T_STRING);\n" n; pr " const char *%s = RSTRING (%sv)->ptr;\n" n n; @@ -371,7 +367,7 @@ get_all_event_callbacks (guestfs_h *g, size_t *len_rtn) pr " {\n"; pr " size_t i, len;\n"; pr " len = RARRAY_LEN (%sv);\n" n; - pr " %s = guestfs_safe_malloc (g, sizeof (char *) * (len+1));\n" + pr " %s = ALLOC_N (char *, len+1);\n" n; pr " for (i = 0; i < len; ++i) {\n"; pr " VALUE v = rb_ary_entry (%sv, i);\n" n; @@ -411,7 +407,6 @@ get_all_event_callbacks (guestfs_h *g, size_t *len_rtn) | Int64 n -> pr " optargs_s.%s = NUM2LL (v);\n" n; | String _ -> - pr " Check_Type (v, T_STRING);\n"; pr " optargs_s.%s = StringValueCStr (v);\n" n | _ -> assert false );