nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

even more macosx warnings

Browse Source
This commit is contained in:
nhmall
2019-06-25 01:07:18 -04:00
parent 972284061d
commit bbedd61c9e
2 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sfdata.c
+92 -92
View File
@@ -12,8 +12,8 @@
#include "wintype.h" #include "wintype.h"
#include "sfproto.h" #include "sfproto.h"
#define BUILD_DATE "Tue Jun 25 00:42:33 2019" #define BUILD_DATE "Tue Jun 25 01:06:17 2019"
#define BUILD_TIME (1561437753L) #define BUILD_TIME (1561439177L)
#define NHTYPE_SIMPLE 1 #define NHTYPE_SIMPLE 1
#define NHTYPE_COMPLEX 2 #define NHTYPE_COMPLEX 2
@@ -5171,95 +5171,95 @@ int cnt;
sfi_addinfo(nhfp, myparent, "end", "you", 1); sfi_addinfo(nhfp, myparent, "end", "you", 1);
} }
struct nhdatatypes_t nhdatatypes[] = { struct nhdatatypes_t nhdatatypes[] = {
{NHTYPE_SIMPLE,"any", sizeof(anything)}, {NHTYPE_SIMPLE, (char *) "any", sizeof(anything)},
{NHTYPE_SIMPLE,"genericptr_t", sizeof(genericptr_t)}, {NHTYPE_SIMPLE, (char *) "genericptr_t", sizeof(genericptr_t)},
{NHTYPE_SIMPLE,"aligntyp", sizeof(aligntyp)}, {NHTYPE_SIMPLE, (char *) "aligntyp", sizeof(aligntyp)},
{NHTYPE_SIMPLE,"Bitfield", sizeof(uint8_t)}, {NHTYPE_SIMPLE, (char *) "Bitfield", sizeof(uint8_t)},
{NHTYPE_SIMPLE,"boolean", sizeof(boolean)}, {NHTYPE_SIMPLE, (char *) "boolean", sizeof(boolean)},
{NHTYPE_SIMPLE,"char", sizeof(char)}, {NHTYPE_SIMPLE, (char *) "char", sizeof(char)},
{NHTYPE_SIMPLE,"int", sizeof(int)}, {NHTYPE_SIMPLE, (char *) "int", sizeof(int)},
{NHTYPE_SIMPLE,"long", sizeof(long)}, {NHTYPE_SIMPLE, (char *) "long", sizeof(long)},
{NHTYPE_SIMPLE,"schar", sizeof(schar)}, {NHTYPE_SIMPLE, (char *) "schar", sizeof(schar)},
{NHTYPE_SIMPLE,"short", sizeof(short)}, {NHTYPE_SIMPLE, (char *) "short", sizeof(short)},
{NHTYPE_SIMPLE,"size_t", sizeof(size_t)}, {NHTYPE_SIMPLE, (char *) "size_t", sizeof(size_t)},
{NHTYPE_SIMPLE,"string", sizeof(uchar)}, {NHTYPE_SIMPLE, (char *) "string", sizeof(uchar)},
{NHTYPE_SIMPLE,"time_t", sizeof(time_t)}, {NHTYPE_SIMPLE, (char *) "time_t", sizeof(time_t)},
{NHTYPE_SIMPLE,"uchar", sizeof(uchar)}, {NHTYPE_SIMPLE, (char *) "uchar", sizeof(uchar)},
{NHTYPE_SIMPLE,"unsigned char", sizeof(unsigned char)}, {NHTYPE_SIMPLE, (char *) "unsigned char", sizeof(unsigned char)},
{NHTYPE_SIMPLE,"unsigned int", sizeof(unsigned int)}, {NHTYPE_SIMPLE, (char *) "unsigned int", sizeof(unsigned int)},
{NHTYPE_SIMPLE,"unsigned long", sizeof(unsigned long)}, {NHTYPE_SIMPLE, (char *) "unsigned long", sizeof(unsigned long)},
{NHTYPE_SIMPLE,"unsigned short", sizeof(unsigned short)}, {NHTYPE_SIMPLE, (char *) "unsigned short", sizeof(unsigned short)},
{NHTYPE_SIMPLE,"unsigned", sizeof(unsigned)}, {NHTYPE_SIMPLE, (char *) "unsigned", sizeof(unsigned)},
{NHTYPE_SIMPLE,"xchar", sizeof(xchar)}, {NHTYPE_SIMPLE, (char *) "xchar", sizeof(xchar)},
{NHTYPE_COMPLEX,"align", sizeof(struct align)}, {NHTYPE_COMPLEX, (char *) "align", sizeof(struct align)},
{NHTYPE_COMPLEX,"attribs", sizeof(struct attribs)}, {NHTYPE_COMPLEX, (char *) "attribs", sizeof(struct attribs)},
{NHTYPE_COMPLEX,"dig_info", sizeof(struct dig_info)}, {NHTYPE_COMPLEX, (char *) "dig_info", sizeof(struct dig_info)},
{NHTYPE_COMPLEX,"tin_info", sizeof(struct tin_info)}, {NHTYPE_COMPLEX, (char *) "tin_info", sizeof(struct tin_info)},
{NHTYPE_COMPLEX,"book_info", sizeof(struct book_info)}, {NHTYPE_COMPLEX, (char *) "book_info", sizeof(struct book_info)},
{NHTYPE_COMPLEX,"takeoff_info", sizeof(struct takeoff_info)}, {NHTYPE_COMPLEX, (char *) "takeoff_info", sizeof(struct takeoff_info)},
{NHTYPE_COMPLEX,"victual_info", sizeof(struct victual_info)}, {NHTYPE_COMPLEX, (char *) "victual_info", sizeof(struct victual_info)},
{NHTYPE_COMPLEX,"warntype_info", sizeof(struct warntype_info)}, {NHTYPE_COMPLEX, (char *) "warntype_info", sizeof(struct warntype_info)},
{NHTYPE_COMPLEX,"polearm_info", sizeof(struct polearm_info)}, {NHTYPE_COMPLEX, (char *) "polearm_info", sizeof(struct polearm_info)},
{NHTYPE_COMPLEX,"obj_split", sizeof(struct obj_split)}, {NHTYPE_COMPLEX, (char *) "obj_split", sizeof(struct obj_split)},
{NHTYPE_COMPLEX,"tribute_info", sizeof(struct tribute_info)}, {NHTYPE_COMPLEX, (char *) "tribute_info", sizeof(struct tribute_info)},
{NHTYPE_COMPLEX,"novel_tracking", sizeof(struct novel_tracking)}, {NHTYPE_COMPLEX, (char *) "novel_tracking", sizeof(struct novel_tracking)},
{NHTYPE_COMPLEX,"context_info", sizeof(struct context_info)}, {NHTYPE_COMPLEX, (char *) "context_info", sizeof(struct context_info)},
{NHTYPE_COMPLEX,"nhcoord", sizeof(struct nhcoord)}, {NHTYPE_COMPLEX, (char *) "nhcoord", sizeof(struct nhcoord)},
{NHTYPE_COMPLEX,"dgn_topology", sizeof(struct dgn_topology)}, {NHTYPE_COMPLEX, (char *) "dgn_topology", sizeof(struct dgn_topology)},
{NHTYPE_COMPLEX,"kinfo", sizeof(struct kinfo)}, {NHTYPE_COMPLEX, (char *) "kinfo", sizeof(struct kinfo)},
{NHTYPE_COMPLEX,"mvitals", sizeof(struct mvitals)}, {NHTYPE_COMPLEX, (char *) "mvitals", sizeof(struct mvitals)},
{NHTYPE_COMPLEX,"ls_t", sizeof(struct ls_t)}, {NHTYPE_COMPLEX, (char *) "ls_t", sizeof(struct ls_t)},
{NHTYPE_COMPLEX,"bubble", sizeof(struct bubble)}, {NHTYPE_COMPLEX, (char *) "bubble", sizeof(struct bubble)},
{NHTYPE_COMPLEX,"d_flags", sizeof(struct d_flags)}, {NHTYPE_COMPLEX, (char *) "d_flags", sizeof(struct d_flags)},
{NHTYPE_COMPLEX,"d_level", sizeof(struct d_level)}, {NHTYPE_COMPLEX, (char *) "d_level", sizeof(struct d_level)},
{NHTYPE_COMPLEX,"s_level", sizeof(struct s_level)}, {NHTYPE_COMPLEX, (char *) "s_level", sizeof(struct s_level)},
{NHTYPE_COMPLEX,"stairway", sizeof(struct stairway)}, {NHTYPE_COMPLEX, (char *) "stairway", sizeof(struct stairway)},
{NHTYPE_COMPLEX,"dest_area", sizeof(struct dest_area)}, {NHTYPE_COMPLEX, (char *) "dest_area", sizeof(struct dest_area)},
{NHTYPE_COMPLEX,"dungeon", sizeof(struct dungeon)}, {NHTYPE_COMPLEX, (char *) "dungeon", sizeof(struct dungeon)},
{NHTYPE_COMPLEX,"branch", sizeof(struct branch)}, {NHTYPE_COMPLEX, (char *) "branch", sizeof(struct branch)},
{NHTYPE_COMPLEX,"linfo", sizeof(struct linfo)}, {NHTYPE_COMPLEX, (char *) "linfo", sizeof(struct linfo)},
{NHTYPE_COMPLEX,"mapseen", sizeof(struct mapseen)}, {NHTYPE_COMPLEX, (char *) "mapseen", sizeof(struct mapseen)},
{NHTYPE_COMPLEX,"mapseen_feat", sizeof(struct mapseen_feat)}, {NHTYPE_COMPLEX, (char *) "mapseen_feat", sizeof(struct mapseen_feat)},
{NHTYPE_COMPLEX,"mapseen_flags", sizeof(struct mapseen_flags)}, {NHTYPE_COMPLEX, (char *) "mapseen_flags", sizeof(struct mapseen_flags)},
{NHTYPE_COMPLEX,"mapseen_rooms", sizeof(struct mapseen_rooms)}, {NHTYPE_COMPLEX, (char *) "mapseen_rooms", sizeof(struct mapseen_rooms)},
{NHTYPE_COMPLEX,"engr", sizeof(struct engr)}, {NHTYPE_COMPLEX, (char *) "engr", sizeof(struct engr)},
{NHTYPE_COMPLEX,"flag", sizeof(struct flag)}, {NHTYPE_COMPLEX, (char *) "flag", sizeof(struct flag)},
{NHTYPE_COMPLEX,"version_info", sizeof(struct version_info)}, {NHTYPE_COMPLEX, (char *) "version_info", sizeof(struct version_info)},
{NHTYPE_COMPLEX,"savefile_info", sizeof(struct savefile_info)}, {NHTYPE_COMPLEX, (char *) "savefile_info", sizeof(struct savefile_info)},
{NHTYPE_COMPLEX,"fakecorridor", sizeof(struct fakecorridor)}, {NHTYPE_COMPLEX, (char *) "fakecorridor", sizeof(struct fakecorridor)},
{NHTYPE_COMPLEX,"egd", sizeof(struct egd)}, {NHTYPE_COMPLEX, (char *) "egd", sizeof(struct egd)},
{NHTYPE_COMPLEX,"epri", sizeof(struct epri)}, {NHTYPE_COMPLEX, (char *) "epri", sizeof(struct epri)},
{NHTYPE_COMPLEX,"bill_x", sizeof(struct bill_x)}, {NHTYPE_COMPLEX, (char *) "bill_x", sizeof(struct bill_x)},
{NHTYPE_COMPLEX,"eshk", sizeof(struct eshk)}, {NHTYPE_COMPLEX, (char *) "eshk", sizeof(struct eshk)},
{NHTYPE_COMPLEX,"emin", sizeof(struct emin)}, {NHTYPE_COMPLEX, (char *) "emin", sizeof(struct emin)},
{NHTYPE_COMPLEX,"edog", sizeof(struct edog)}, {NHTYPE_COMPLEX, (char *) "edog", sizeof(struct edog)},
{NHTYPE_COMPLEX,"mextra", sizeof(struct mextra)}, {NHTYPE_COMPLEX, (char *) "mextra", sizeof(struct mextra)},
{NHTYPE_COMPLEX,"mkroom", sizeof(struct mkroom)}, {NHTYPE_COMPLEX, (char *) "mkroom", sizeof(struct mkroom)},
{NHTYPE_COMPLEX,"monst", sizeof(struct monst)}, {NHTYPE_COMPLEX, (char *) "monst", sizeof(struct monst)},
{NHTYPE_COMPLEX,"vptrs", sizeof(union vptrs)}, {NHTYPE_COMPLEX, (char *) "vptrs", sizeof(union vptrs)},
{NHTYPE_COMPLEX,"oextra", sizeof(struct oextra)}, {NHTYPE_COMPLEX, (char *) "oextra", sizeof(struct oextra)},
{NHTYPE_COMPLEX,"obj", sizeof(struct obj)}, {NHTYPE_COMPLEX, (char *) "obj", sizeof(struct obj)},
{NHTYPE_COMPLEX,"objclass", sizeof(struct objclass)}, {NHTYPE_COMPLEX, (char *) "objclass", sizeof(struct objclass)},
{NHTYPE_COMPLEX,"fruit", sizeof(struct fruit)}, {NHTYPE_COMPLEX, (char *) "fruit", sizeof(struct fruit)},
{NHTYPE_COMPLEX,"prop", sizeof(struct prop)}, {NHTYPE_COMPLEX, (char *) "prop", sizeof(struct prop)},
{NHTYPE_COMPLEX,"q_score", sizeof(struct q_score)}, {NHTYPE_COMPLEX, (char *) "q_score", sizeof(struct q_score)},
{NHTYPE_COMPLEX,"nhrect", sizeof(struct nhrect)}, {NHTYPE_COMPLEX, (char *) "nhrect", sizeof(struct nhrect)},
{NHTYPE_COMPLEX,"rm", sizeof(struct rm)}, {NHTYPE_COMPLEX, (char *) "rm", sizeof(struct rm)},
{NHTYPE_COMPLEX,"damage", sizeof(struct damage)}, {NHTYPE_COMPLEX, (char *) "damage", sizeof(struct damage)},
{NHTYPE_COMPLEX,"cemetery", sizeof(struct cemetery)}, {NHTYPE_COMPLEX, (char *) "cemetery", sizeof(struct cemetery)},
{NHTYPE_COMPLEX,"levelflags", sizeof(struct levelflags)}, {NHTYPE_COMPLEX, (char *) "levelflags", sizeof(struct levelflags)},
{NHTYPE_COMPLEX,"skills", sizeof(struct skills)}, {NHTYPE_COMPLEX, (char *) "skills", sizeof(struct skills)},
{NHTYPE_COMPLEX,"spell", sizeof(struct spell)}, {NHTYPE_COMPLEX, (char *) "spell", sizeof(struct spell)},
{NHTYPE_COMPLEX,"fe", sizeof(struct fe)}, {NHTYPE_COMPLEX, (char *) "fe", sizeof(struct fe)},
{NHTYPE_COMPLEX,"vlaunchinfo", sizeof(union vlaunchinfo)}, {NHTYPE_COMPLEX, (char *) "vlaunchinfo", sizeof(union vlaunchinfo)},
{NHTYPE_COMPLEX,"trap", sizeof(struct trap)}, {NHTYPE_COMPLEX, (char *) "trap", sizeof(struct trap)},
{NHTYPE_COMPLEX,"u_have", sizeof(struct u_have)}, {NHTYPE_COMPLEX, (char *) "u_have", sizeof(struct u_have)},
{NHTYPE_COMPLEX,"u_event", sizeof(struct u_event)}, {NHTYPE_COMPLEX, (char *) "u_event", sizeof(struct u_event)},
{NHTYPE_COMPLEX,"u_achieve", sizeof(struct u_achieve)}, {NHTYPE_COMPLEX, (char *) "u_achieve", sizeof(struct u_achieve)},
{NHTYPE_COMPLEX,"u_realtime", sizeof(struct u_realtime)}, {NHTYPE_COMPLEX, (char *) "u_realtime", sizeof(struct u_realtime)},
{NHTYPE_COMPLEX,"u_conduct", sizeof(struct u_conduct)}, {NHTYPE_COMPLEX, (char *) "u_conduct", sizeof(struct u_conduct)},
{NHTYPE_COMPLEX,"u_roleplay", sizeof(struct u_roleplay)}, {NHTYPE_COMPLEX, (char *) "u_roleplay", sizeof(struct u_roleplay)},
{NHTYPE_COMPLEX,"you", sizeof(struct you)} {NHTYPE_COMPLEX, (char *) "you", sizeof(struct you)}
}; };
int nhdatatypes_size() int nhdatatypes_size()
@@ -5267,7 +5267,7 @@ int nhdatatypes_size()
return SIZE(nhdatatypes); return SIZE(nhdatatypes);
} }
char *critical_members[] = { const char *critical_members[] = {
"struct align:type:aligntyp", "struct align:type:aligntyp",
"struct align:record:int", "struct align:record:int",
"struct attribs:a:schar", "struct attribs:a:schar",
util/readtags.c
+3 -3
View File
@@ -808,7 +808,7 @@ FILE *fp1;
for (k = 0; k < SIZE(readtagstypes); ++k) { for (k = 0; k < SIZE(readtagstypes); ++k) {
if (readtagstypes[k].dtclass == NHTYPE_SIMPLE) { if (readtagstypes[k].dtclass == NHTYPE_SIMPLE) {
Fprintf(fp1,"\t{NHTYPE_SIMPLE,\"%s\", sizeof(%s)},\n", Fprintf(fp1,"\t{NHTYPE_SIMPLE, (char *) \"%s\", sizeof(%s)},\n",
readtagstypes[k].dtype, readtagstypes[k].dtype,
(strncmpi(readtagstypes[k].dtype, "Bitfield", 8) == 0) ? (strncmpi(readtagstypes[k].dtype, "Bitfield", 8) == 0) ?
"uint8_t" : "uint8_t" :
@@ -834,7 +834,7 @@ FILE *fp1;
} }
if (cnt > 0) if (cnt > 0)
Fprintf(fp1, "%s", ",\n"); Fprintf(fp1, "%s", ",\n");
Fprintf(fp1, "\t{NHTYPE_COMPLEX,\"%s\", sizeof(%s %s)}", Fprintf(fp1, "\t{NHTYPE_COMPLEX, (char *) \"%s\", sizeof(%s %s)}",
t->tag, t->tag,
(t->tagtype == 's') ? "struct" : "union", t->tag); (t->tagtype == 's') ? "struct" : "union", t->tag);
cnt += 1; cnt += 1;
@@ -966,7 +966,7 @@ static void generate_c_files()
Fprintf(SFDATA,"static uint8_t bitfield = 0;\n"); Fprintf(SFDATA,"static uint8_t bitfield = 0;\n");
output_types(SFDATATMP); output_types(SFDATATMP);
Fprintf(SFDATATMP,"char *critical_members[] = {\n"); Fprintf(SFDATATMP,"const char *critical_members[] = {\n");
k = 0; k = 0;
opening = 1; opening = 1;