summaryrefslogtreecommitdiffstats
path: root/pack.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-05-29 05:20:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-05-29 05:20:39 +0000
commit01d834c833686cd36a275d510e1797dda0650859 (patch)
tree568c351a894d8dfe24458b342b4e79d8df5444b2 /pack.c
parentbaa320bf271da022032fe09abf01b9e5e776f939 (diff)
downloadruby-01d834c833686cd36a275d510e1797dda0650859.tar.gz
ruby-01d834c833686cd36a275d510e1797dda0650859.tar.xz
ruby-01d834c833686cd36a275d510e1797dda0650859.zip
* parse.y: yyparse #defines moved from intern.h
* ruby.c (proc_options): access prefixed "ruby_yydebug". * applied modifies to pacify some of gcc -Wall warnings. * parse.y (arg): no more ugly hack for "**", so that "-2**2" to be parsed as "(-2)**2", whereas "- 2**2" or "-(2)**2" to be parsed as "-(2**2)". * parse.y (yylex): '-2' to be literal fixnum. [new] * time.c (time_succ): new method for Range support. * time.c (time_arg): nil test against v[6] (usec). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'pack.c')
-rw-r--r--pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pack.c b/pack.c
index f43b74822..8e072c968 100644
--- a/pack.c
+++ b/pack.c
@@ -1549,7 +1549,7 @@ pack_unpack(str, fmt)
{
VALUE str = infected_str_new(0, (send - s)*3/4, str);
char *ptr = RSTRING(str)->ptr;
- int a,b,c,d;
+ int a,b,c = 0,d;
static int first = 1;
static int b64_xtable[256];
@@ -1834,7 +1834,7 @@ utf8_to_uv(p, lenp)
if (n != 0) {
uv &= (1<<(BYTEWIDTH-2-n)) - 1;
while (n--) {
- uv = uv << 6 | *p++ & ((1<<6)-1);
+ uv = uv << 6 | (*p++ & ((1<<6)-1));
}
}
return uv;