summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 08:36:47 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-13 08:36:47 +0000
commit2fd8e39e094a24dc6ac2f766cb78dab7fb3308a6 (patch)
treecacfe0ca6c4aa24a60dcd20ea606dd05051adc7b
parent56e03c1bc8cfa127b4b991104e7363b2ea444c32 (diff)
downloadruby-2fd8e39e094a24dc6ac2f766cb78dab7fb3308a6.tar.gz
ruby-2fd8e39e094a24dc6ac2f766cb78dab7fb3308a6.tar.xz
ruby-2fd8e39e094a24dc6ac2f766cb78dab7fb3308a6.zip
* transcode.c (transcode_restartable0): several local variables
removed. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--transcode.c15
2 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 826bc44aa..e19c7cefd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 13 17:35:58 2008 Tanaka Akira <akr@fsij.org>
+
+ * transcode.c (transcode_restartable0): several local variables
+ removed.
+
Wed Aug 13 17:31:12 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* vm_insnhelper.c (caller_setup_args): should ensure if the value
diff --git a/transcode.c b/transcode.c
index b196d3d74..051ac7086 100644
--- a/transcode.c
+++ b/transcode.c
@@ -362,9 +362,6 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
const unsigned char *in_p;
unsigned char *out_p;
- const BYTE_LOOKUP *next_table;
- VALUE next_info;
- unsigned char next_byte;
unsigned char empty_buf;
unsigned char *empty_ptr = &empty_buf;
@@ -382,9 +379,6 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
in_p = inchar_start = *in_pos;
out_p = *out_pos;
- next_table = tc->next_table;
- next_info = tc->next_info;
- next_byte = tc->next_byte;
#define SUSPEND(ret, num) \
do { \
@@ -399,9 +393,6 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
tc->recognized_len -= readagain_len; \
tc->readagain_len = readagain_len; \
} \
- tc->next_table = next_table; \
- tc->next_info = next_info; \
- tc->next_byte = next_byte; \
return ret; \
resume_label ## num:; \
} while (0)
@@ -410,6 +401,9 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
while (out_stop - out_p < 1) { SUSPEND(transcode_obuf_full, num); } \
} while (0)
+#define next_table (tc->next_table)
+#define next_info (tc->next_info)
+#define next_byte (tc->next_byte)
#define writebuf_len (tc->writebuf_len)
#define writebuf_off (tc->writebuf_off)
@@ -591,6 +585,9 @@ transcode_restartable0(const unsigned char **in_pos, unsigned char **out_pos,
while (1)
SUSPEND(transcode_finished, 6);
#undef SUSPEND
+#undef next_table
+#undef next_info
+#undef next_byte
#undef writebuf_len
#undef writebuf_off
}