summaryrefslogtreecommitdiff
path: root/pack.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 13:49:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 13:49:43 +0000
commit89c408704bc7034c06cb465ad8ba9b25f32de301 (patch)
tree8376886d19205bc98aa080934adb39a59d797a86 /pack.c
parentf07ca6b1c40fdeb2f37e6e425b0f667a1cae8cdb (diff)
* enumerator.c (enumerator_each, enumerator_with_index): suppress
warnings. * pack.c (pack_unpack): ditto. * process.c (rb_syswait): ditto. * re.c (rb_reg_prepare_enc, rb_reg_prepare_re, rb_reg_adjust_startpos): ditto. * regparse.c (onig_name_to_group_numbers): ditto. * missing/vsnprintf.c (BSD_vfprintf): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'pack.c')
-rw-r--r--pack.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/pack.c b/pack.c
index 0ccc58bfbe..c5a5337eae 100644
--- a/pack.c
+++ b/pack.c
@@ -1871,8 +1871,8 @@ pack_unpack(VALUE str, VALUE fmt)
case 'P':
if (sizeof(char *) <= send - s) {
+ VALUE tmp = Qnil;
char *t;
- VALUE tmp;
memcpy(&t, s, sizeof(char *));
s += sizeof(char *);
@@ -1902,9 +1902,6 @@ pack_unpack(VALUE str, VALUE fmt)
rb_raise(rb_eArgError, "non associated pointer");
}
}
- else {
- tmp = Qnil;
- }
UNPACK_PUSH(tmp);
}
break;
@@ -1916,7 +1913,7 @@ pack_unpack(VALUE str, VALUE fmt)
if (send - s < sizeof(char *))
break;
else {
- VALUE tmp;
+ VALUE tmp = Qnil;
char *t;
memcpy(&t, s, sizeof(char *));
@@ -1941,9 +1938,6 @@ pack_unpack(VALUE str, VALUE fmt)
rb_raise(rb_eArgError, "non associated pointer");
}
}
- else {
- tmp = Qnil;
- }
UNPACK_PUSH(tmp);
}
}