Remove magic members from instance globals.
We ought to trust compiler and we have other tools to check oob access.
This commit is contained in:
@@ -181,7 +181,6 @@ struct instance_globals_a {
|
||||
struct h2o_ctx acid_ctx;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_b {
|
||||
@@ -219,7 +218,6 @@ struct instance_globals_b {
|
||||
boolean bot_disabled;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_c {
|
||||
@@ -299,7 +297,6 @@ struct instance_globals_c {
|
||||
|
||||
/* zap.c */
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_d {
|
||||
@@ -341,7 +338,6 @@ struct instance_globals_d {
|
||||
boolean decor_levitate_override;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_e {
|
||||
@@ -362,7 +358,6 @@ struct instance_globals_e {
|
||||
to gb.beyond_savefile_load */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_f {
|
||||
@@ -387,7 +382,6 @@ struct instance_globals_f {
|
||||
long int followmsg; /* last time of follow message */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_g {
|
||||
@@ -435,7 +429,6 @@ struct instance_globals_g {
|
||||
long glyphmap_perlevel_flags;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_h {
|
||||
@@ -456,7 +449,6 @@ struct instance_globals_h {
|
||||
struct attack *hitmsg_prev;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_i {
|
||||
@@ -490,7 +482,6 @@ struct instance_globals_i {
|
||||
/* new */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_j {
|
||||
@@ -499,7 +490,6 @@ struct instance_globals_j {
|
||||
int jumping_is_magic; /* current jump result of magic */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_k {
|
||||
@@ -513,7 +503,6 @@ struct instance_globals_k {
|
||||
boolean known;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_l {
|
||||
@@ -579,7 +568,6 @@ struct instance_globals_l {
|
||||
char lua_copyright[LUA_COPYRIGHT_BUFSIZ];
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_m {
|
||||
@@ -646,7 +634,6 @@ struct instance_globals_m {
|
||||
* POT_WATER should become discovered */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_n {
|
||||
@@ -696,7 +683,6 @@ struct instance_globals_n {
|
||||
short nocreate4;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_o {
|
||||
@@ -755,7 +741,6 @@ struct instance_globals_o {
|
||||
boolean obj_zapped;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_p {
|
||||
@@ -806,13 +791,11 @@ struct instance_globals_p {
|
||||
|
||||
/* new stuff */
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_q {
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_r {
|
||||
@@ -841,7 +824,6 @@ struct instance_globals_r {
|
||||
struct repo repo;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_s {
|
||||
@@ -923,7 +905,6 @@ struct instance_globals_s {
|
||||
int seethru; /* 'bubble' debugging: clouds and water don't block light */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_t {
|
||||
@@ -974,7 +955,6 @@ struct instance_globals_t {
|
||||
int twohits; /* 0: single hit; 1: first of 2; 2: second of 2 */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_u {
|
||||
@@ -994,7 +974,6 @@ struct instance_globals_u {
|
||||
|
||||
/* new stuff */
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_v {
|
||||
@@ -1031,7 +1010,6 @@ struct instance_globals_v {
|
||||
struct sound_voice voice;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_w {
|
||||
@@ -1056,7 +1034,6 @@ struct instance_globals_w {
|
||||
struct win_settings wsettings; /* wintype.h */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_x {
|
||||
@@ -1077,7 +1054,6 @@ struct instance_globals_x {
|
||||
coordxy xstart, xsize;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_y {
|
||||
@@ -1095,7 +1071,6 @@ struct instance_globals_y {
|
||||
coordxy ystart, ysize;
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_z {
|
||||
@@ -1112,7 +1087,6 @@ struct instance_globals_z {
|
||||
* remember who zapped the wand. */
|
||||
|
||||
boolean havestate;
|
||||
unsigned long magic; /* validate that structure layout is preserved */
|
||||
};
|
||||
|
||||
struct instance_globals_saved_b {
|
||||
|
||||
Reference in New Issue
Block a user