Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* encoding.c (rb_enc_codepoint_len): Use UNREACHABLE to avoid "control

  reaches end of non-void function" warnings.  [ruby-trunk - Bug #6066]
* re.c (name_to_backref_number):  ditto.
* object.c (rb_Float):  ditto.
* io.c (io_readpartial):  ditto.
* io.c (io_read_nonblock):  ditto.
* pack.c (rb_uv_to_utf8):  ditto.
* proc.c (rb_method_entry_arity):  ditto.
* vm_method.c (rb_f_notimplement):  ditto.
* struct.c (rb_struct_aset_id):  ditto.
* class.c (rb_scan_args):  ditto.
* process.c (rlimit_resource_type):  ditto.
* process.c (rlimit_resource_value):  ditto.
* process.c (p_uid_switch):  ditto.
* process.c (p_gid_switch):  ditto.
* ext/digest/digest.c (rb_digest_instance_update):  ditto.
* ext/digest/digest.c (rb_digest_instance_finish):  ditto.
* ext/digest/digest.c (rb_digest_instance_reset):  ditto.
* ext/digest/digest.c (rb_digest_instance_block_length):  ditto.
* ext/bigdecimal/bigdecimal.c (BigDecimalCmp):  ditto.
* ext/dl/handle.c (rb_dlhandle_close):  ditto.
* ext/tk/tcltklib.c (pending_exception_check0):  ditto.
* ext/tk/tcltklib.c (pending_exception_check1):  ditto.
* ext/tk/tcltklib.c (ip_cancel_eval_core):  ditto.
* ext/tk/tcltklib.c (lib_get_reltype_name):  ditto.
* ext/tk/tcltklib.c (create_dummy_encoding_for_tk_core):  ditto.
* ext/tk/tkutil/tkutil.c (tk_hash_kv):  ditto.
* ext/openssl/ossl_ssl.c (ossl_ssl_session_reused):  ditto.
* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_dsa_verify_asn1):  ditto.
* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_at_infinit):  ditto.
* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_on_curve):  ditto.
* ext/fiddle/conversions.c (generic_to_value):  ditto.
* ext/socket/raddrinfo.c (rsock_io_socket_addrinfo):  ditto.
* ext/socket/socket.c (sock_s_getnameinfo):  ditto.
* ext/ripper/eventids2.c (ripper_token2eventid):  ditto.
* cont.c (return_fiber):  ditto.
* dmydln.c (dln_load):  ditto.
* vm_insnhelper.c (vm_search_normal_superclass):  ditto.
* bignum.c (big_fdiv):  ditto.
* marshal.c (r_symlink):  ditto.
* marshal.c (r_symbol):  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 338a0a0b73aee30228d84fc0e0fe45d3b17db866 1 parent 62b53bd
Eric Hodel drbrain authored
44 ChangeLog
View
@@ -1,3 +1,47 @@
+Sat Apr 14 08:38:20 2012 Eric Hodel <drbrain@segment7.net>
+
+ * encoding.c (rb_enc_codepoint_len): Use UNREACHABLE to avoid "control
+ reaches end of non-void function" warnings. [ruby-trunk - Bug #6066]
+ * re.c (name_to_backref_number): ditto.
+ * object.c (rb_Float): ditto.
+ * io.c (io_readpartial): ditto.
+ * io.c (io_read_nonblock): ditto.
+ * pack.c (rb_uv_to_utf8): ditto.
+ * proc.c (rb_method_entry_arity): ditto.
+ * vm_method.c (rb_f_notimplement): ditto.
+ * struct.c (rb_struct_aset_id): ditto.
+ * class.c (rb_scan_args): ditto.
+ * process.c (rlimit_resource_type): ditto.
+ * process.c (rlimit_resource_value): ditto.
+ * process.c (p_uid_switch): ditto.
+ * process.c (p_gid_switch): ditto.
+ * ext/digest/digest.c (rb_digest_instance_update): ditto.
+ * ext/digest/digest.c (rb_digest_instance_finish): ditto.
+ * ext/digest/digest.c (rb_digest_instance_reset): ditto.
+ * ext/digest/digest.c (rb_digest_instance_block_length): ditto.
+ * ext/bigdecimal/bigdecimal.c (BigDecimalCmp): ditto.
+ * ext/dl/handle.c (rb_dlhandle_close): ditto.
+ * ext/tk/tcltklib.c (pending_exception_check0): ditto.
+ * ext/tk/tcltklib.c (pending_exception_check1): ditto.
+ * ext/tk/tcltklib.c (ip_cancel_eval_core): ditto.
+ * ext/tk/tcltklib.c (lib_get_reltype_name): ditto.
+ * ext/tk/tcltklib.c (create_dummy_encoding_for_tk_core): ditto.
+ * ext/tk/tkutil/tkutil.c (tk_hash_kv): ditto.
+ * ext/openssl/ossl_ssl.c (ossl_ssl_session_reused): ditto.
+ * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_dsa_verify_asn1): ditto.
+ * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_at_infinit): ditto.
+ * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_is_on_curve): ditto.
+ * ext/fiddle/conversions.c (generic_to_value): ditto.
+ * ext/socket/raddrinfo.c (rsock_io_socket_addrinfo): ditto.
+ * ext/socket/socket.c (sock_s_getnameinfo): ditto.
+ * ext/ripper/eventids2.c (ripper_token2eventid): ditto.
+ * cont.c (return_fiber): ditto.
+ * dmydln.c (dln_load): ditto.
+ * vm_insnhelper.c (vm_search_normal_superclass): ditto.
+ * bignum.c (big_fdiv): ditto.
+ * marshal.c (r_symlink): ditto.
+ * marshal.c (r_symbol): ditto.
+
Fri Apr 13 17:12:09 2012 NARUSE, Yui <naruse@ruby-lang.org>
* hash.c (inspect_i): keep string's coderange.
3  bignum.c
View
@@ -3001,7 +3001,8 @@ big_fdiv(VALUE x, VALUE y)
goto bignum;
}
rb_bug("big_fdiv");
- /* NOTREACHED */
+
+ UNREACHABLE;
}
/*
2  class.c
View
@@ -1656,6 +1656,8 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
argc_error:
rb_error_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
+
+ UNREACHABLE;
}
/*!
2  cont.c
View
@@ -1110,6 +1110,8 @@ return_fiber(void)
fib->prev = Qnil;
return prev;
}
+
+ UNREACHABLE;
}
VALUE rb_fiber_transfer(VALUE fib, int argc, VALUE *argv);
2  dmydln.c
View
@@ -4,4 +4,6 @@ void*
dln_load(const char *file)
{
rb_loaderror("this executable file can't load extension libraries");
+
+ UNREACHABLE;
}
2  encoding.c
View
@@ -928,6 +928,8 @@ rb_enc_codepoint_len(const char *p, const char *e, int *len_p, rb_encoding *enc)
}
else
rb_raise(rb_eArgError, "invalid byte sequence in %s", rb_enc_name(enc));
+
+ UNREACHABLE;
}
#undef rb_enc_codepoint
2  ext/bigdecimal/bigdecimal.c
View
@@ -971,6 +971,8 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
}
rb_bug("Undefined operation in BigDecimalCmp()");
+
+ UNREACHABLE;
}
/* Returns True if the value is zero. */
8 ext/digest/digest.c
View
@@ -154,6 +154,8 @@ static VALUE
rb_digest_instance_update(VALUE self, VALUE str)
{
rb_digest_instance_method_unimpl(self, "update");
+
+ UNREACHABLE;
}
/*
@@ -172,6 +174,8 @@ static VALUE
rb_digest_instance_finish(VALUE self)
{
rb_digest_instance_method_unimpl(self, "finish");
+
+ UNREACHABLE;
}
/*
@@ -186,6 +190,8 @@ static VALUE
rb_digest_instance_reset(VALUE self)
{
rb_digest_instance_method_unimpl(self, "reset");
+
+ UNREACHABLE;
}
/*
@@ -409,6 +415,8 @@ static VALUE
rb_digest_instance_block_length(VALUE self)
{
rb_digest_instance_method_unimpl(self, "block_length");
+
+ UNREACHABLE;
}
/*
2  ext/dl/handle.c
View
@@ -78,6 +78,8 @@ rb_dlhandle_close(VALUE self)
return INT2NUM(ret);
}
rb_raise(rb_eDLError, "dlclose() called too many times");
+
+ UNREACHABLE;
}
VALUE
2  ext/fiddle/conversions.c
View
@@ -134,6 +134,8 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
default:
rb_raise(rb_eRuntimeError, "unknown type %d", type);
}
+
+ UNREACHABLE;
}
/* vim: set noet sw=4 sts=4 */
6 ext/openssl/ossl_pkey_ec.c
View
@@ -700,6 +700,8 @@ static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
}
ossl_raise(eECError, "ECDSA_verify");
+
+ UNREACHABLE;
}
static void ossl_ec_group_free(ossl_ec_group *ec_group)
@@ -1349,6 +1351,8 @@ static VALUE ossl_ec_point_is_at_infinity(VALUE self)
case 0: return Qfalse;
default: ossl_raise(cEC_POINT, "EC_POINT_is_at_infinity");
}
+
+ UNREACHABLE;
}
/*
@@ -1370,6 +1374,8 @@ static VALUE ossl_ec_point_is_on_curve(VALUE self)
case 0: return Qfalse;
default: ossl_raise(cEC_POINT, "EC_POINT_is_on_curve");
}
+
+ UNREACHABLE;
}
/*
2  ext/openssl/ossl_ssl.c
View
@@ -1593,6 +1593,8 @@ ossl_ssl_session_reused(VALUE self)
case 0: return Qfalse;
default: ossl_raise(eSSLError, "SSL_session_reused");
}
+
+ UNREACHABLE;
}
/*
2  ext/ripper/eventids2.c
View
@@ -275,4 +275,6 @@ ripper_token2eventid(int tok)
return ripper_id_CHAR;
}
rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
+
+ UNREACHABLE;
}
2  ext/socket/raddrinfo.c
View
@@ -2144,6 +2144,8 @@ rsock_io_socket_addrinfo(VALUE io, struct sockaddr *addr, socklen_t len)
default:
rb_raise(rb_eTypeError, "neither IO nor file descriptor");
}
+
+ UNREACHABLE;
}
/*
2  ext/socket/socket.c
View
@@ -1334,6 +1334,8 @@ sock_s_getnameinfo(int argc, VALUE *argv)
error_exit_name:
if (res) freeaddrinfo(res);
rsock_raise_socket_error("getnameinfo", error);
+
+ UNREACHABLE;
}
/*
10 ext/tk/tcltklib.c
View
@@ -1407,6 +1407,8 @@ pending_exception_check0()
} else {
return 0;
}
+
+ UNREACHABLE;
}
static int
@@ -1448,6 +1450,8 @@ pending_exception_check1(thr_crit_bup, ptr)
} else {
return 0;
}
+
+ UNREACHABLE;
}
@@ -7781,6 +7785,8 @@ ip_cancel_eval_core(interp, msg, flag)
#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 6)
rb_raise(rb_eNotImpError,
"cancel_eval is supported Tcl/Tk8.6 or later.");
+
+ UNREACHABLE;
#else
Tcl_Obj *msg_obj;
@@ -10014,6 +10020,8 @@ lib_get_reltype_name(self)
default:
rb_raise(rb_eRuntimeError, "tcltklib has invalid release type number");
}
+
+ UNREACHABLE;
}
@@ -10117,6 +10125,8 @@ create_dummy_encoding_for_tk_core(interp, name, error_mode)
return Qnil;
}
}
+
+ UNREACHABLE;
#else
return name;
#endif
2  ext/tk/tkutil/tkutil.c
View
@@ -800,6 +800,8 @@ tk_hash_kv(argc, argv, self)
}
rb_raise(rb_eArgError, "Hash is expected for 1st argument");
}
+
+ UNREACHABLE;
}
static VALUE
4 io.c
View
@@ -2338,6 +2338,8 @@ io_readpartial(int argc, VALUE *argv, VALUE io)
rb_eof_error();
else
return ret;
+
+ UNREACHABLE;
}
/*
@@ -2399,6 +2401,8 @@ io_read_nonblock(int argc, VALUE *argv, VALUE io)
rb_eof_error();
else
return ret;
+
+ UNREACHABLE;
}
/*
4 marshal.c
View
@@ -1147,6 +1147,8 @@ r_symlink(struct load_arg *arg)
return (ID)id;
}
rb_raise(rb_eArgError, "bad symbol");
+
+ UNREACHABLE;
}
static ID
@@ -1193,6 +1195,8 @@ r_symbol(struct load_arg *arg)
rb_raise(rb_eArgError, "dump format error for symbol(0x%x)", type);
break;
}
+
+ UNREACHABLE;
}
static VALUE
2  object.c
View
@@ -2483,6 +2483,8 @@ rb_Float(VALUE val)
default:
return rb_convert_type(val, T_FLOAT, "Float", "to_f");
}
+
+ UNREACHABLE;
}
/*
2  pack.c
View
@@ -2199,6 +2199,8 @@ rb_uv_to_utf8(char buf[6], unsigned long uv)
return 6;
}
rb_raise(rb_eRangeError, "pack(U): value out of range");
+
+ UNREACHABLE;
}
static const unsigned long utf8_limits[] = {
2  proc.c
View
@@ -1663,6 +1663,8 @@ rb_method_entry_arity(const rb_method_entry_t *me)
}
}
rb_bug("rb_method_entry_arity: invalid method entry type (%d)", def->type);
+
+ UNREACHABLE;
}
/*
8 process.c
View
@@ -3829,6 +3829,8 @@ rlimit_resource_type(VALUE rtype)
return r;
rb_raise(rb_eArgError, "invalid resource name: %s", name);
+
+ UNREACHABLE;
}
static rlim_t
@@ -3867,6 +3869,8 @@ rlimit_resource_value(VALUE rval)
if (strcmp(name, "SAVED_CUR") == 0) return RLIM_SAVED_CUR;
#endif
rb_raise(rb_eArgError, "invalid resource value: %s", name);
+
+ UNREACHABLE;
}
#endif
@@ -5690,6 +5694,8 @@ p_uid_switch(VALUE obj)
errno = EPERM;
rb_sys_fail(0);
}
+
+ UNREACHABLE;
}
#else
static VALUE
@@ -5803,6 +5809,8 @@ p_gid_switch(VALUE obj)
errno = EPERM;
rb_sys_fail(0);
}
+
+ UNREACHABLE;
}
#else
static VALUE
2  re.c
View
@@ -1665,6 +1665,8 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
rb_raise(rb_eIndexError, "undefined group name reference: %s",
StringValuePtr(s));
}
+
+ UNREACHABLE;
}
/*
2  struct.c
View
@@ -681,6 +681,8 @@ rb_struct_aset_id(VALUE s, ID id, VALUE val)
}
}
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
+
+ UNREACHABLE;
}
/*
2  vm_insnhelper.c
View
@@ -1462,6 +1462,8 @@ vm_search_normal_superclass(VALUE klass, VALUE recv)
else {
rb_bug("vm_search_normal_superclass: should not be reach here");
}
+
+ UNREACHABLE;
}
static void
2  vm_method.c
View
@@ -66,6 +66,8 @@ VALUE
rb_f_notimplement(int argc, VALUE *argv, VALUE obj)
{
rb_notimplement();
+
+ UNREACHABLE;
}
static void
Please sign in to comment.
Something went wrong with that request. Please try again.