admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

pack.c: hold enum values in enum variables not int.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-06-05 20:04:59 +09:00
parent abb288f5cb
commit f01c29b0ec
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-pack/src/pack.c
+13 -6
View File
@@ -23,7 +23,7 @@ struct tmpl {
int idx;
};
enum {
enum pack_dir {
PACK_DIR_CHAR, /* C */
PACK_DIR_SHORT, /* S */
PACK_DIR_LONG, /* L */
@@ -41,7 +41,7 @@ enum {
PACK_DIR_INVALID
};
enum {
enum pack_type {
PACK_TYPE_INTEGER,
PACK_TYPE_FLOAT,
PACK_TYPE_STRING,
@@ -918,6 +918,7 @@ pack_x(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, long count, u
}
return count;
}
static int
unpack_x(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, unsigned int flags)
{
@@ -942,10 +943,12 @@ has_tmpl(const struct tmpl *tmpl)
}
static void
read_tmpl(mrb_state *mrb, struct tmpl *tmpl, int *dirp, int *typep, int *sizep, int *countp, unsigned int *flagsp)
read_tmpl(mrb_state *mrb, struct tmpl *tmpl, enum pack_dir *dirp, enum pack_type *typep, int *sizep, int *countp, unsigned int *flagsp)
{
mrb_int t, tlen;
int ch, dir, type, size = 0;
int ch, size = 0;
enum pack_dir dir;
enum pack_type type;
int count = 1;
unsigned int flags = 0;
const char *tptr;
@@ -1173,7 +1176,9 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary)
struct tmpl tmpl;
int count;
unsigned int flags;
int dir, ridx, size, type;
enum pack_dir dir;
enum pack_type type;
int ridx, size;
prepare_tmpl(mrb, &tmpl);
@@ -1278,7 +1283,9 @@ pack_unpack(mrb_state *mrb, mrb_value str, int single)
struct tmpl tmpl;
int count;
unsigned int flags;
int dir, size, type;
enum pack_dir dir;
enum pack_type type;
int size;
int srcidx, srclen;
const unsigned char *sptr;