From: nhmall Date: Tue, 15 Feb 2022 13:13:27 +0000 (-0500) Subject: remove obsolete function and references X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0a4b38bf630123d4f0458e8c68b5225d756cc1f;p=nethack remove obsolete function and references --- diff --git a/include/extern.h b/include/extern.h index 6e290ee48..965ed2266 100644 --- a/include/extern.h +++ b/include/extern.h @@ -1660,7 +1660,6 @@ extern int dosuspend(void); #endif #endif /* TOS */ #ifdef WIN32 -extern char *get_username(int *); extern void nt_regularize(char *); extern int(*nt_kbhit)(void); extern void Delay(int); diff --git a/sys/share/nhlan.c b/outdated/sys/share similarity index 100% rename from sys/share/nhlan.c rename to outdated/sys/share diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32 index 9e66f5900..c41e46504 100644 --- a/sys/windows/Makefile.mingw32 +++ b/sys/windows/Makefile.mingw32 @@ -720,7 +720,7 @@ COREOBJS = $(addsuffix .o, allmain alloc apply artifact attrib ball bones botl c hack hacklib insight invent isaac64 light lock \ mail makemon mcastu mdlib mhitm mhitu minion mklev mkmap mkmaze mkobj mkroom \ mon mondata monmove monst mplayer mthrowu muse music \ - nhlan nhlobj nhlsel nhlua ntsound o_init objects objnam options \ + nhlobj nhlsel nhlua ntsound o_init objects objnam options \ pager pickup pline polyself potion pray priest quest questpgr \ random read rect region restore rip rnd role rumors \ safeproc save sfstruct shk shknam sit sounds sp_lev spell steal steed stubs symbols sys \ diff --git a/sys/windows/Makefile.msc b/sys/windows/Makefile.msc index 94cc55d2c..810071788 100644 --- a/sys/windows/Makefile.msc +++ b/sys/windows/Makefile.msc @@ -500,7 +500,7 @@ CURSESOBJ= $(O)cursdial.o $(O)cursinit.o $(O)cursinvt.o $(O)cursmain.o \ $(O)cursmesg.o $(O)cursmisc.o $(O)cursstat.o $(O)curswins.o SOBJ = $(O)windmain.o $(O)windsys.o $(O)win10.o \ - $(O)safeproc.o $(O)nhlan.o $(SOUND) + $(O)safeproc.o $(SOUND) OBJS = $(MDLIB) \ $(VOBJ01) $(VOBJ02) $(VOBJ03) $(VOBJ04) $(VOBJ05) \ diff --git a/sys/windows/windsys.c b/sys/windows/windsys.c index d0cef911a..98f6fa525 100644 --- a/sys/windows/windsys.c +++ b/sys/windows/windsys.c @@ -176,38 +176,6 @@ void nt_regularize(char* s) /* normalize file name */ *lp = '_'; } -/* - * This is used in nhlan.c to implement some of the LAN_FEATURES. - */ -char * -get_username(int *lan_username_size) -{ - static TCHAR username_buffer[BUFSZ]; - DWORD i = BUFSZ - 1; - BOOL allowUserName = TRUE; - - Strcpy(username_buffer, "NetHack"); - -#ifndef WIN32CON - /* Our privacy policy for the windows store version of nethack makes - * a promise about not collecting any personally identifiable information. - * Do not allow getting user name if we being run from windows store - * version of nethack. In 3.7, we should remove use of username. - */ - allowUserName = !win10_is_desktop_bridge_application(); -#endif - - if (allowUserName) { - /* i gets updated with actual size */ - if (GetUserName(username_buffer, &i)) - username_buffer[i] = '\0'; - } - - if (lan_username_size) - *lan_username_size = strlen(username_buffer); - return username_buffer; -} - #if 0 char *getxxx(void) {