From 1a481f401c0498d5ce20672065def519deaffcc5 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Wed, 16 Dec 2020 23:20:06 -0500 Subject: [PATCH] More cleaning and updates in prep for 3.6.0 --- src/cc/CCMarmara.h | 5 ++++- src/cc/CCinclude.h | 6 +++--- src/cc/crypto777/OS_portable.h | 0 src/cc/rogue/Makefile.in | 3 +++ src/cc/rogue/armor.c | 3 +++ src/cc/rogue/chase.c | 3 +++ src/cc/rogue/command.c | 3 +++ src/cc/rogue/cursesd.c | 3 +++ src/cc/rogue/cursesd.h | 3 +++ src/cc/rogue/daemon.c | 3 +++ src/cc/rogue/daemons.c | 3 +++ src/cc/rogue/extern.c | 3 +++ src/cc/rogue/extern.h | 3 +++ src/cc/rogue/fight.c | 3 +++ src/cc/rogue/init.c | 3 +++ src/cc/rogue/io.c | 3 +++ src/cc/rogue/list.c | 3 +++ src/cc/rogue/mach_dep.c | 3 +++ src/cc/rogue/main.c | 9 +++++---- src/cc/rogue/mdport.c | 3 +++ src/cc/rogue/misc.c | 3 +++ src/cc/rogue/monsters.c | 5 ++++- src/cc/rogue/move.c | 3 +++ src/cc/rogue/new_level.c | 3 +++ src/cc/rogue/options.c | 3 +++ src/cc/rogue/pack.c | 3 +++ src/cc/rogue/passages.c | 3 +++ src/cc/rogue/potions.c | 8 +++++--- src/cc/rogue/rings.c | 3 +++ src/cc/rogue/rip.c | 3 +++ src/cc/rogue/rogue.c | 7 +++++-- src/cc/rogue/rogue.h | 3 +++ src/cc/rogue/rogue_player.h | 3 +++ src/cc/rogue/rooms.c | 3 +++ src/cc/rogue/save.c | 3 +++ src/cc/rogue/score.h | 3 +++ src/cc/rogue/scrolls.c | 3 +++ src/cc/rogue/state.c | 3 +++ src/cc/rogue/sticks.c | 3 +++ src/cc/rogue/things.c | 3 +++ src/cc/rogue/vers.c | 5 ++++- src/cc/rogue/weapons.c | 3 +++ src/cc/rogue/wizard.c | 3 +++ src/cc/rogue/xcrypt.c | 4 ++++ src/hush.h | 14 +++++++------- src/hush_cJSON.c | 2 +- src/hush_globals.h | 2 +- src/hush_notary.h | 2 +- 48 files changed, 149 insertions(+), 25 deletions(-) mode change 100755 => 100644 src/cc/crypto777/OS_portable.h diff --git a/src/cc/CCMarmara.h b/src/cc/CCMarmara.h index 5fe03b992..85ef90fa5 100644 --- a/src/cc/CCMarmara.h +++ b/src/cc/CCMarmara.h @@ -20,8 +20,10 @@ #ifndef CC_MARMARA_H #define CC_MARMARA_H +/* + #include "CCinclude.h" -#include "../komodo_cJSON.h" +#include "../hush_cJSON.h" #define MARMARA_GROUPSIZE 60 #define MARMARA_MINLOCK (1440 * 3 * 30) @@ -46,5 +48,6 @@ bool MarmaraValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &t // CCcustom UniValue MarmaraInfo(); +*/ #endif diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h index 24485d660..2eafc975c 100644 --- a/src/cc/CCinclude.h +++ b/src/cc/CCinclude.h @@ -69,8 +69,8 @@ Details. #include "../utlist.h" #include "../uthash.h" #include "merkleblock.h" -#include "../komodo_nSPV_defs.h" -#include "../komodo_cJSON.h" +#include "../hush_nSPV_defs.h" +#include "../hush_cJSON.h" #include "../init.h" #include "rpc/server.h" @@ -85,7 +85,7 @@ Details. #define CCDISABLEALL memset(ASSETCHAINS_CCDISABLES,1,sizeof(ASSETCHAINS_CCDISABLES)) #define CCENABLE(x) ASSETCHAINS_CCDISABLES[((uint8_t)x)] = 0 -/* moved to komodo_cJSON.h +/* moved to hush_cJSON.h #ifndef _BITS256 #define _BITS256 union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; }; diff --git a/src/cc/crypto777/OS_portable.h b/src/cc/crypto777/OS_portable.h old mode 100755 new mode 100644 diff --git a/src/cc/rogue/Makefile.in b/src/cc/rogue/Makefile.in index 2669a2025..34bafbdd7 100644 --- a/src/cc/rogue/Makefile.in +++ b/src/cc/rogue/Makefile.in @@ -1,3 +1,6 @@ +# Copyright (c) 2016-2020 The Hush developers +# Distributed under the GPLv3 software license, see the accompanying +# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html ############################################################################### # # Makefile for rogue diff --git a/src/cc/rogue/armor.c b/src/cc/rogue/armor.c index 20c5704a8..bf7d84566 100644 --- a/src/cc/rogue/armor.c +++ b/src/cc/rogue/armor.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * This file contains misc functions for dealing with armor * @(#)armor.c 4.14 (Berkeley) 02/05/99 diff --git a/src/cc/rogue/chase.c b/src/cc/rogue/chase.c index 059df470d..abc19e3d4 100644 --- a/src/cc/rogue/chase.c +++ b/src/cc/rogue/chase.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Code for one creature to chase another * diff --git a/src/cc/rogue/command.c b/src/cc/rogue/command.c index 568f4b8f8..65bc324ff 100644 --- a/src/cc/rogue/command.c +++ b/src/cc/rogue/command.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Read and execute the user commands * diff --git a/src/cc/rogue/cursesd.c b/src/cc/rogue/cursesd.c index 6c295fc94..27c42ce39 100644 --- a/src/cc/rogue/cursesd.c +++ b/src/cc/rogue/cursesd.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /****************************************************************************** * Copyright © 2014-2019 The SuperNET Developers. * * * diff --git a/src/cc/rogue/cursesd.h b/src/cc/rogue/cursesd.h index 7dd83d435..cfaa6bbc5 100644 --- a/src/cc/rogue/cursesd.h +++ b/src/cc/rogue/cursesd.h @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /****************************************************************************** * Copyright © 2014-2019 The SuperNET Developers. * * * diff --git a/src/cc/rogue/daemon.c b/src/cc/rogue/daemon.c index 81bdd0a73..ad931451d 100644 --- a/src/cc/rogue/daemon.c +++ b/src/cc/rogue/daemon.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Contains functions for dealing with things that happen in the * future. diff --git a/src/cc/rogue/daemons.c b/src/cc/rogue/daemons.c index c9c16448d..13d951500 100644 --- a/src/cc/rogue/daemons.c +++ b/src/cc/rogue/daemons.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * All the daemon and fuse functions are in here * diff --git a/src/cc/rogue/extern.c b/src/cc/rogue/extern.c index fdb77307c..fa7462825 100644 --- a/src/cc/rogue/extern.c +++ b/src/cc/rogue/extern.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * global variable initializaton * diff --git a/src/cc/rogue/extern.h b/src/cc/rogue/extern.h index c62646b67..92bfbcec5 100644 --- a/src/cc/rogue/extern.h +++ b/src/cc/rogue/extern.h @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Defines for things used in mach_dep.c * diff --git a/src/cc/rogue/fight.c b/src/cc/rogue/fight.c index 9cb4bf61e..6b5225981 100644 --- a/src/cc/rogue/fight.c +++ b/src/cc/rogue/fight.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * All the fighting gets done here * diff --git a/src/cc/rogue/init.c b/src/cc/rogue/init.c index b11cfa80c..b6e023e4b 100644 --- a/src/cc/rogue/init.c +++ b/src/cc/rogue/init.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * global variable initializaton * diff --git a/src/cc/rogue/io.c b/src/cc/rogue/io.c index ad22407f6..6d5ced070 100644 --- a/src/cc/rogue/io.c +++ b/src/cc/rogue/io.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Various input/output functions * diff --git a/src/cc/rogue/list.c b/src/cc/rogue/list.c index a021c6a8f..458ae99f5 100644 --- a/src/cc/rogue/list.c +++ b/src/cc/rogue/list.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Functions for dealing with linked lists of goodies * diff --git a/src/cc/rogue/mach_dep.c b/src/cc/rogue/mach_dep.c index 6d0e1c66f..995338766 100644 --- a/src/cc/rogue/mach_dep.c +++ b/src/cc/rogue/mach_dep.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Various installation dependent routines * diff --git a/src/cc/rogue/main.c b/src/cc/rogue/main.c index f12915fa0..792a32f59 100644 --- a/src/cc/rogue/main.c +++ b/src/cc/rogue/main.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /****************************************************************************** * Copyright © 2014-2019 The SuperNET Developers. * * * @@ -12,8 +15,6 @@ * Removal or modification of this copyright notice is prohibited. * * * ******************************************************************************/ - - #include #include #include @@ -254,9 +255,9 @@ int32_t safecopy(char *dest,char *src,long len) #define true 1 #define false 0 #ifdef STANDALONE -#include "../komodo/src/komodo_cJSON.c" +#include "../hush3/src/hush_cJSON.c" #else -#include "../../komodo_cJSON.c" +#include "../../hush_cJSON.c" #endif int32_t rogue_replay(uint64_t seed,int32_t sleeptime); diff --git a/src/cc/rogue/mdport.c b/src/cc/rogue/mdport.c index fd53be72c..fe7e695dc 100644 --- a/src/cc/rogue/mdport.c +++ b/src/cc/rogue/mdport.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* mdport.c - Machine Dependent Code for Porting Unix/Curses games diff --git a/src/cc/rogue/misc.c b/src/cc/rogue/misc.c index 5f9a89dcc..b9db42ed2 100644 --- a/src/cc/rogue/misc.c +++ b/src/cc/rogue/misc.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * All sorts of miscellaneous routines * diff --git a/src/cc/rogue/monsters.c b/src/cc/rogue/monsters.c index 7e1186e8d..3bf81c166 100644 --- a/src/cc/rogue/monsters.c +++ b/src/cc/rogue/monsters.c @@ -1,5 +1,8 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* - * File with various monster functions in it + * File with various monster functions in it, none as evil as KYC * * @(#)monsters.c 4.46 (Berkeley) 02/05/99 * diff --git a/src/cc/rogue/move.c b/src/cc/rogue/move.c index c70d668ca..10156ec07 100644 --- a/src/cc/rogue/move.c +++ b/src/cc/rogue/move.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * hero movement commands * diff --git a/src/cc/rogue/new_level.c b/src/cc/rogue/new_level.c index c7f08ff28..37b9418b0 100644 --- a/src/cc/rogue/new_level.c +++ b/src/cc/rogue/new_level.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * new_level: * Dig and draw a new level diff --git a/src/cc/rogue/options.c b/src/cc/rogue/options.c index 258bd184f..17338ec0f 100644 --- a/src/cc/rogue/options.c +++ b/src/cc/rogue/options.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * This file has all the code for the option command. I would rather * this command were not necessary, but it is the only way to keep the diff --git a/src/cc/rogue/pack.c b/src/cc/rogue/pack.c index 1f2f3faaa..0671ee0e8 100644 --- a/src/cc/rogue/pack.c +++ b/src/cc/rogue/pack.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Routines to deal with the pack * diff --git a/src/cc/rogue/passages.c b/src/cc/rogue/passages.c index 606d1a658..ac13790e7 100644 --- a/src/cc/rogue/passages.c +++ b/src/cc/rogue/passages.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Draw the connecting passages * diff --git a/src/cc/rogue/potions.c b/src/cc/rogue/potions.c index 2425b051f..333a136f2 100644 --- a/src/cc/rogue/potions.c +++ b/src/cc/rogue/potions.c @@ -1,5 +1,8 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* - * Function(s) for dealing with potions + * Function(s) for dealing with potions, mmmmmmmmmm, potionzzzzzzz * * @(#)potions.c 4.46 (Berkeley) 06/07/83 * @@ -55,8 +58,7 @@ static PACT p_actions[] = * Quaff a potion from the pack */ -void -quaff(struct rogue_state *rs) +void quaff(struct rogue_state *rs) { THING *obj, *tp, *mp; bool discardit = FALSE; diff --git a/src/cc/rogue/rings.c b/src/cc/rogue/rings.c index f9ce50795..84785f1bc 100644 --- a/src/cc/rogue/rings.c +++ b/src/cc/rogue/rings.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Routines dealing specifically with rings * diff --git a/src/cc/rogue/rip.c b/src/cc/rogue/rip.c index 123b1aaa8..5f8672525 100644 --- a/src/cc/rogue/rip.c +++ b/src/cc/rogue/rip.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * File for the fun ends * Death or a total win diff --git a/src/cc/rogue/rogue.c b/src/cc/rogue/rogue.c index c687fd019..46433c742 100644 --- a/src/cc/rogue/rogue.c +++ b/src/cc/rogue/rogue.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Rogue: Exploring the Dungeons of Doom * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman @@ -16,9 +19,9 @@ #include "rogue.h" #ifdef STANDALONE -#include "../komodo/src/komodo_cJSON.h" +#include "../hush3/src/hush_cJSON.h" #else -#include "../../komodo_cJSON.h" +#include "../../hush_cJSON.h" #endif /* diff --git a/src/cc/rogue/rogue.h b/src/cc/rogue/rogue.h index 65ddf1e51..95dc99b0f 100644 --- a/src/cc/rogue/rogue.h +++ b/src/cc/rogue/rogue.h @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Rogue definitions and variable declarations * diff --git a/src/cc/rogue/rogue_player.h b/src/cc/rogue/rogue_player.h index e6b7a69e6..67e4ecc70 100644 --- a/src/cc/rogue/rogue_player.h +++ b/src/cc/rogue/rogue_player.h @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /****************************************************************************** * Copyright © 2014-2019 The SuperNET Developers. * * * diff --git a/src/cc/rogue/rooms.c b/src/cc/rogue/rooms.c index 67ca701d9..3419c6f2e 100644 --- a/src/cc/rogue/rooms.c +++ b/src/cc/rogue/rooms.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Create the layout for the new level * diff --git a/src/cc/rogue/save.c b/src/cc/rogue/save.c index 4df79e150..36221e228 100644 --- a/src/cc/rogue/save.c +++ b/src/cc/rogue/save.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * save and restore routines * diff --git a/src/cc/rogue/score.h b/src/cc/rogue/score.h index a5897b482..9e3ff8398 100644 --- a/src/cc/rogue/score.h +++ b/src/cc/rogue/score.h @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Score file structure * diff --git a/src/cc/rogue/scrolls.c b/src/cc/rogue/scrolls.c index 8ed6d2648..fcb17b1fc 100644 --- a/src/cc/rogue/scrolls.c +++ b/src/cc/rogue/scrolls.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Read a scroll and let it happen * diff --git a/src/cc/rogue/state.c b/src/cc/rogue/state.c index 9963bbc9e..7d838b022 100644 --- a/src/cc/rogue/state.c +++ b/src/cc/rogue/state.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* state.c - Portable Rogue Save State Code diff --git a/src/cc/rogue/sticks.c b/src/cc/rogue/sticks.c index cd559daef..d956eb7af 100644 --- a/src/cc/rogue/sticks.c +++ b/src/cc/rogue/sticks.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Functions to implement the various sticks one might find * while wandering around the dungeon. diff --git a/src/cc/rogue/things.c b/src/cc/rogue/things.c index e0cf48454..cccbc8436 100644 --- a/src/cc/rogue/things.c +++ b/src/cc/rogue/things.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Contains functions for dealing with things like potions, scrolls, * and other items. diff --git a/src/cc/rogue/vers.c b/src/cc/rogue/vers.c index 6fbf7be87..1c4350a77 100644 --- a/src/cc/rogue/vers.c +++ b/src/cc/rogue/vers.c @@ -1,5 +1,8 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* - * Version number. Whenever a new version number is desired, use sccs + * Version number. Whenever a new version number is desired, use sccs(!) * to get vers.c. encstr is declared here to force it to be loaded * before the version number, and therefore not to be written in saved * games. diff --git a/src/cc/rogue/weapons.c b/src/cc/rogue/weapons.c index 0a8b6016c..75ca41f44 100644 --- a/src/cc/rogue/weapons.c +++ b/src/cc/rogue/weapons.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Functions for dealing with problems brought about by weapons * diff --git a/src/cc/rogue/wizard.c b/src/cc/rogue/wizard.c index 35ce9fb54..456207523 100644 --- a/src/cc/rogue/wizard.c +++ b/src/cc/rogue/wizard.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * Special wizard commands (some of which are also non-wizard commands * under strange circumstances) diff --git a/src/cc/rogue/xcrypt.c b/src/cc/rogue/xcrypt.c index 671e20718..77c8f2f86 100644 --- a/src/cc/rogue/xcrypt.c +++ b/src/cc/rogue/xcrypt.c @@ -1,3 +1,6 @@ +// Copyright (c) 2016-2020 The Hush developers +// Distributed under the GPLv3 software license, see the accompanying +// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html /* * FreeSec: libcrypt * @@ -47,6 +50,7 @@ * This file has a static version of des_setkey() so that crypt.o exports * only the crypt() interface. This is required to make binaries linked * against crypt.o exportable or re-exportable from the USA. + * NOTE2: Math is freedom of speech. -- Duke Leto */ #include diff --git a/src/hush.h b/src/hush.h index fdad77627..06e755d1b 100644 --- a/src/hush.h +++ b/src/hush.h @@ -45,16 +45,16 @@ bool check_pprevnotarizedht(); #include "hush_globals.h" #include "hush_utils.h" #include "hush_curve25519.h" -#include "komodo_cJSON.c" +#include "hush_cJSON.c" #include "hush_bitcoind.h" -#include "komodo_pax.h" +#include "hush_pax.h" #include "hush_notary.h" int32_t hush_parsestatefile(struct hush_state *sp,FILE *fp,char *symbol,char *dest); -#include "komodo_kv.h" +#include "hush_kv.h" #include "hush_gateway.h" -#include "komodo_events.h" -#include "komodo_ccdata.h" +#include "hush_events.h" +#include "hush_ccdata.h" void hush_currentheight_set(int32_t height) { @@ -98,7 +98,7 @@ int32_t hush_parsestatefile(struct hush_state *sp,FILE *fp,char *symbol,char *de else { //printf("updated %d pubkeys at %s ht.%d\n",num,symbol,ht); - if ( (KOMODO_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && KOMODO_EXTERNAL_NOTARIES == 0) ) + if ( (HUSH_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && HUSH_EXTERNAL_NOTARIES == 0) ) komodo_eventadd_pubkeys(sp,symbol,ht,num,pubkeys); } } else printf("illegal num.%d\n",num); @@ -243,7 +243,7 @@ int32_t hush_parsestatefiledata(struct hush_state *sp,uint8_t *filedata,long *fp else { //printf("updated %d pubkeys at %s ht.%d\n",num,symbol,ht); - if ( (KOMODO_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && KOMODO_EXTERNAL_NOTARIES == 0) ) + if ( (HUSH_EXTERNAL_NOTARIES != 0 && matched != 0) || (strcmp(symbol,"KMD") == 0 && HUSH_EXTERNAL_NOTARIES == 0) ) komodo_eventadd_pubkeys(sp,symbol,ht,num,pubkeys); } } else printf("illegal num.%d\n",num); diff --git a/src/hush_cJSON.c b/src/hush_cJSON.c index 10140ad02..facf79f2a 100644 --- a/src/hush_cJSON.c +++ b/src/hush_cJSON.c @@ -26,7 +26,7 @@ #include #include "cJSON.h" -#include "komodo_cJSON.h" +#include "hush_cJSON.h" #include "cJSON.c" #ifndef DBL_EPSILON diff --git a/src/hush_globals.h b/src/hush_globals.h index a9850370b..f89157cb2 100644 --- a/src/hush_globals.h +++ b/src/hush_globals.h @@ -47,7 +47,7 @@ int COINBASE_MATURITY = _COINBASE_MATURITY;//100; unsigned int WITNESS_CACHE_SIZE = _COINBASE_MATURITY+10; uint256 HUSH_EARLYTXID; -int32_t HUSH_MININGTHREADS = -1,IS_HUSH_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,KOMODO_EXTERNAL_NOTARIES,HUSH_PASSPORT_INITDONE,KOMODO_PAX,HUSH_EXCHANGEWALLET,HUSH_REWIND,HUSH_CONNECTING = -1,KOMODO_DEALERNODE,HUSH_EXTRASATOSHI,ASSETCHAINS_FOUNDERS,ASSETCHAINS_CBMATURITY,HUSH_NSPV; +int32_t HUSH_MININGTHREADS = -1,IS_HUSH_NOTARY,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,HUSH_EXTERNAL_NOTARIES,HUSH_PASSPORT_INITDONE,KOMODO_PAX,HUSH_EXCHANGEWALLET,HUSH_REWIND,HUSH_CONNECTING = -1,KOMODO_DEALERNODE,HUSH_EXTRASATOSHI,ASSETCHAINS_FOUNDERS,ASSETCHAINS_CBMATURITY,HUSH_NSPV; int32_t HUSH_INSYNC,KOMODO_LASTMINED,prevKOMODO_LASTMINED,KOMODO_CCACTIVATE,JUMBLR_PAUSE = 1; std::string NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_OVERRIDE_PUBKEY,DONATION_PUBKEY,ASSETCHAINS_SCRIPTPUB,NOTARY_ADDRESS,ASSETCHAINS_SELFIMPORT,ASSETCHAINS_CCLIB; uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEYHASH[20],ASSETCHAINS_PUBLIC,ASSETCHAINS_PRIVATE,ASSETCHAINS_TXPOW,ASSETCHAINS_MARMARA; diff --git a/src/hush_notary.h b/src/hush_notary.h index 58f6646b7..a5792ad69 100644 --- a/src/hush_notary.h +++ b/src/hush_notary.h @@ -17,7 +17,7 @@ ******************************************************************************/ #include "hush_defs.h" -#include "komodo_cJSON.h" +#include "hush_cJSON.h" #define KOMODO_MAINNET_START 178999 #define KOMODO_NOTARIES_HEIGHT1 814000