Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Core/Worldserver: Updated server daemon it is now more streamlined to…

… trinity/skyfire,

worldserver is now running off ACE_singleton as it should be.
Core/Logging: Added support for SQLDriver (SQL Query logging).
Core/Soap: Dropped old OCSoap and implemented newest soap build.

Repo: Codestyle cleanups. tabs2spaces, "if(" ->"if (" , "switch("->"switch ("

Conflicts:

	dep/acelite/ace/ACE.cpp
	dep/acelite/ace/Basic_Types.cpp
	dep/acelite/ace/CMakeLists.txt
	dep/acelite/ace/Configuration_Import_Export.cpp
	dep/acelite/ace/IOStream.cpp
	dep/acelite/ace/Log_Msg.cpp
	dep/acelite/ace/Message_Block.cpp
	dep/acelite/ace/Notification_Queue.cpp
	dep/acelite/ace/OS_NS_Thread.cpp
	dep/acelite/ace/OS_NS_fcntl.cpp
	dep/acelite/ace/OS_NS_netdb.cpp
	dep/acelite/ace/OS_NS_sys_utsname.cpp
	dep/acelite/ace/OS_NS_time.cpp
	dep/acelite/ace/SOCK_Connector.cpp
	dep/acelite/ace/SOCK_Dgram.cpp
	dep/acelite/ace/SOCK_IO.cpp
	dep/acelite/ace/Select_Reactor_Base.cpp
	dep/acelite/ace/Service_Repository.cpp
	dep/acelite/ace/Stack_Trace.cpp
	dep/acelite/ace/TTY_IO.cpp
	dep/g3dlite/CMakeLists.txt
	dep/g3dlite/source/Any.cpp
	dep/g3dlite/source/CollisionDetection.cpp
	dep/g3dlite/source/System.cpp
	dep/g3dlite/source/fileutils.cpp
	dep/g3dlite/source/prompt.cpp
	dep/gsoap/CMakeLists.txt
	dep/gsoap/soapC.cpp
	dep/gsoap/soapH.h
	dep/gsoap/soapServer.cpp
	dep/gsoap/soapStub.h
	dep/gsoap/stdsoap2.h
	dep/mysqllite/CMakeLists.txt
	dep/mysqllite/dbug/dbug.c
	dep/mysqllite/mysys/default.c
	dep/mysqllite/mysys/mf_keycache.c
	dep/mysqllite/mysys/mf_tempfile.c
	dep/mysqllite/mysys/my_fopen.c
	dep/mysqllite/mysys/my_gethwaddr.c
	dep/mysqllite/mysys/my_pread.c
	dep/mysqllite/mysys/my_quick.c
	dep/mysqllite/mysys/my_wincond.c
	dep/mysqllite/mysys/my_winfile.c
	dep/mysqllite/mysys/my_winthread.c
	dep/mysqllite/mysys/stacktrace.c
	dep/mysqllite/sql-common/client_plugin.c
	dep/mysqllite/strings/ctype.c
	dep/mysqllite/strings/xml.c
	dep/mysqllite/vio/viosocket.c
	src/server/worldserver/RemoteAccess/RARunnable.cpp
	src/server/worldserver/RemoteAccess/RARunnable.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/RemoteAccess/RASocket.h
  • Loading branch information...
commit 61da2eefd8cc2209feb258290be1e273e23c836d 1 parent 1675daa
@Bootz Bootz authored
Showing with 1,220 additions and 1,188 deletions.
  1. +4 −4 CMakeLists.txt
  2. +1 −1  dep/acelite/ace/ACE.cpp
  3. +1 −1  dep/acelite/ace/Basic_Types.cpp
  4. +1 −1  dep/acelite/ace/CMakeLists.txt
  5. +1 −1  dep/acelite/ace/Configuration_Import_Export.cpp
  6. +1 −1  dep/acelite/ace/IOStream.cpp
  7. +1 −1  dep/acelite/ace/Log_Msg.cpp
  8. +2 −2 dep/acelite/ace/Message_Block.cpp
  9. +1 −1  dep/acelite/ace/Notification_Queue.cpp
  10. +2 −2 dep/acelite/ace/OS_NS_Thread.cpp
  11. +1 −1  dep/acelite/ace/OS_NS_fcntl.cpp
  12. +2 −2 dep/acelite/ace/OS_NS_netdb.cpp
  13. +1 −1  dep/acelite/ace/OS_NS_sys_utsname.cpp
  14. +1 −1  dep/acelite/ace/OS_NS_time.cpp
  15. +1 −1  dep/acelite/ace/SOCK_Connector.cpp
  16. +3 −3 dep/acelite/ace/SOCK_Dgram.cpp
  17. +1 −1  dep/acelite/ace/SOCK_IO.cpp
  18. +1 −1  dep/acelite/ace/Select_Reactor_Base.cpp
  19. +3 −3 dep/acelite/ace/Service_Repository.cpp
  20. +2 −2 dep/acelite/ace/Stack_Trace.cpp
  21. +1 −1  dep/acelite/ace/TTY_IO.cpp
  22. +1 −1  dep/g3dlite/CMakeLists.txt
  23. +1 −1  dep/g3dlite/source/Any.cpp
  24. +16 −16 dep/g3dlite/source/CollisionDetection.cpp
  25. +1 −1  dep/g3dlite/source/System.cpp
  26. +4 −4 dep/g3dlite/source/fileutils.cpp
  27. +1 −1  dep/g3dlite/source/prompt.cpp
  28. +1 −1  dep/gsoap/CMakeLists.txt
  29. +1 −0  dep/gsoap/soapC.cpp
  30. +17 −0 dep/gsoap/soapH.h
  31. +1 −0  dep/gsoap/soapServer.cpp
  32. +6 −0 dep/gsoap/soapStub.h
  33. +14 −13 dep/gsoap/stdsoap2.h
  34. +5 −5 dep/mysqllite/CMakeLists.txt
  35. +2 −2 dep/mysqllite/dbug/dbug.c
  36. +1 −1  dep/mysqllite/mysys/default.c
  37. +3 −3 dep/mysqllite/mysys/mf_keycache.c
  38. +1 −1  dep/mysqllite/mysys/mf_tempfile.c
  39. +1 −1  dep/mysqllite/mysys/my_fopen.c
  40. +1 −1  dep/mysqllite/mysys/my_gethwaddr.c
  41. +2 −2 dep/mysqllite/mysys/my_pread.c
  42. +1 −1  dep/mysqllite/mysys/my_quick.c
  43. +3 −3 dep/mysqllite/mysys/my_wincond.c
  44. +36 −36 dep/mysqllite/mysys/my_winfile.c
  45. +3 −3 dep/mysqllite/mysys/my_winthread.c
  46. +15 −15 dep/mysqllite/mysys/stacktrace.c
  47. +2 −2 dep/mysqllite/sql-common/client_plugin.c
  48. +1 −1  dep/mysqllite/strings/ctype.c
  49. +1 −1  dep/mysqllite/strings/xml.c
  50. +2 −2 dep/mysqllite/vio/viosocket.c
  51. +6 −6 src/server/authserver/CMakeLists.txt
  52. +2 −2 src/server/authserver/Server/AuthSocket.cpp
  53. +4 −4 src/server/collision/CMakeLists.txt
  54. +2 −2 src/server/game/AI/CoreAI/UnitAI.cpp
  55. +1 −1  src/server/game/AI/EventAI/CreatureEventAI.cpp
  56. +3 −3 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
  57. +1 −1  src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
  58. +1 −1  src/server/game/AI/ScriptedAI/ScriptedGuardAI.cpp
  59. +4 −5 src/server/game/Accounts/AccountMgr.cpp
  60. +0 −1  src/server/game/Accounts/AccountMgr.h
  61. +2 −2 src/server/game/AuctionHouse/AuctionHouseBot.cpp
  62. +20 −20 src/server/game/AuctionHouse/AuctionHouseBot.h
  63. +1 −1  src/server/game/AuctionHouse/AuctionHouseMgr.cpp
  64. +2 −2 src/server/game/Battlegrounds/ArenaTeam.cpp
  65. +5 −5 src/server/game/Battlegrounds/Battleground.cpp
  66. +14 −14 src/server/game/Battlegrounds/BattlegroundMgr.cpp
  67. +2 −2 src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
  68. +4 −4 src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
  69. +1 −1  src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
  70. +3 −3 src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
  71. +1 −1  src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
  72. +1 −1  src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
  73. +2 −2 src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
  74. +1 −1  src/server/game/CMakeLists.txt
  75. +27 −24 src/server/game/Chat/Chat.cpp
  76. +5 −1 src/server/game/Chat/Chat.h
  77. +1 −1  src/server/game/Chat/Commands/Debugcmds.cpp
  78. +1 −1  src/server/game/Chat/Commands/Level0.cpp
  79. +2 −2 src/server/game/Chat/Commands/Level1.cpp
  80. +3 −3 src/server/game/Chat/Commands/Level2.cpp
  81. +17 −17 src/server/game/Chat/Commands/Level3.cpp
  82. +1 −1  src/server/game/Combat/ThreatManager.cpp
  83. +1 −1  src/server/game/DataStores/DBCStores.cpp
  84. +5 −5 src/server/game/Entities/Creature/Creature.cpp
  85. +1 −1  src/server/game/Entities/Creature/TemporarySummon.cpp
  86. +6 −6 src/server/game/Entities/GameObject/GameObject.cpp
  87. +6 −6 src/server/game/Entities/GameObject/GameObject.h
  88. +3 −3 src/server/game/Entities/Item/Item.cpp
  89. +1 −1  src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
  90. +3 −3 src/server/game/Entities/Item/ItemPrototype.h
  91. +8 −8 src/server/game/Entities/Object/Object.cpp
  92. +1 −1  src/server/game/Entities/Object/ObjectGuid.cpp
  93. +3 −3 src/server/game/Entities/Object/ObjectGuid.h
  94. +5 −5 src/server/game/Entities/Pet/Pet.cpp
  95. +31 −31 src/server/game/Entities/Player/Player.cpp
  96. +2 −2 src/server/game/Entities/Player/SocialMgr.cpp
  97. +1 −1  src/server/game/Entities/Totem/Totem.cpp
  98. +14 −14 src/server/game/Entities/Unit/StatSystem.cpp
  99. +51 −51 src/server/game/Entities/Unit/Unit.cpp
  100. +1 −1  src/server/game/Events/GameEventMgr.cpp
  101. +8 −8 src/server/game/Globals/ObjectMgr.cpp
  102. +1 −1  src/server/game/Grids/Cells/CellImpl.h
  103. +3 −3 src/server/game/Mails/Mail.cpp
  104. +3 −3 src/server/game/Maps/Map.cpp
  105. +1 −1  src/server/game/Miscellaneous/Formulas.h
  106. +3 −1 src/server/game/Miscellaneous/Language.h
  107. +2 −2 src/server/game/Miscellaneous/SharedDefines.h
  108. +1 −1  src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
  109. +1 −1  src/server/game/OutdoorPvP/OutdoorPvP.cpp
  110. +1 −1  src/server/game/Scripting/ScriptMgr.cpp
  111. +1 −1  src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp
  112. +3 −3 src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp
  113. +2 −2 src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
  114. +3 −3 src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
  115. +1 −1  src/server/game/Server/Protocol/Handlers/LootHandler.cpp
  116. +2 −2 src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
  117. +1 −1  src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
  118. +3 −3 src/server/game/Server/Protocol/Handlers/PetHandler.cpp
  119. +1 −1  src/server/game/Server/Protocol/Handlers/PetitionsHandler.cpp
  120. +4 −4 src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
  121. +1 −1  src/server/game/Server/Protocol/Handlers/TradeHandler.cpp
  122. +2 −3 src/server/game/Server/WorldSession.cpp
  123. +1 −1  src/server/game/Server/WorldSocket.cpp
  124. +38 −38 src/server/game/Spells/Auras/SpellAuras.cpp
  125. +32 −32 src/server/game/Spells/Spell.cpp
  126. +1 −1  src/server/game/Spells/Spell.h
  127. +44 −44 src/server/game/Spells/SpellEffects.cpp
  128. +31 −31 src/server/game/Spells/SpellMgr.cpp
  129. +1 −1  src/server/game/Spells/SpellMgr.h
  130. +1 −1  src/server/game/Tools/PlayerDump.cpp
  131. +2 −2 src/server/game/Weather/Weather.cpp
  132. +1 −1  src/server/game/World/World.cpp
  133. +5 −5 src/server/scripts/CMakeLists.txt
  134. +1 −1  src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
  135. +7 −7 src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
  136. +6 −6 src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
  137. +5 −5 src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
  138. +5 −5 src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
  139. +3 −3 src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
  140. +6 −6 src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
  141. +2 −2 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
  142. +5 −5 src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
  143. +1 −1  src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
  144. +3 −3 src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
  145. +2 −2 src/server/scripts/EasternKingdoms/Naxxramas/boss_anubrekhan.cpp
  146. +2 −2 src/server/scripts/EasternKingdoms/Naxxramas/boss_four_horsemen.cpp
  147. +2 −2 src/server/scripts/EasternKingdoms/Naxxramas/boss_highlord_mograine.cpp
  148. +3 −3 src/server/scripts/EasternKingdoms/Naxxramas/boss_kelthuzad.cpp
  149. +1 −1  src/server/scripts/EasternKingdoms/Naxxramas/boss_maexxna.cpp
  150. +3 −3 src/server/scripts/EasternKingdoms/Naxxramas/boss_thaddius.cpp
  151. +3 −3 src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
  152. +4 −4 src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
  153. +1 −1  src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
  154. +2 −2 src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
  155. +6 −6 src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
  156. +1 −1  src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
  157. +2 −2 src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp
  158. +6 −6 src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
  159. +1 −1  src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
  160. +2 −2 src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
  161. +5 −5 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
  162. +4 −4 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
  163. +3 −3 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
  164. +7 −7 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
  165. +5 −5 src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
  166. +6 −6 src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
  167. +2 −2 src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
  168. +2 −2 src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
  169. +1 −1  src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
  170. +2 −2 src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
  171. +1 −1  src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
  172. +4 −4 src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
  173. +1 −1  src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
  174. +4 −4 src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
  175. +1 −1  src/server/scripts/EasternKingdoms/arathi_highlands.cpp
  176. +3 −3 src/server/scripts/EasternKingdoms/eversong_woods.cpp
  177. +1 −1  src/server/scripts/EasternKingdoms/ghostlands.cpp
  178. +3 −3 src/server/scripts/EasternKingdoms/hinterlands.cpp
  179. +1 −1  src/server/scripts/EasternKingdoms/loch_modan.cpp
  180. +2 −2 src/server/scripts/EasternKingdoms/redridge_mountains.cpp
  181. +1 −1  src/server/scripts/EasternKingdoms/silverpine_forest.cpp
  182. +7 −7 src/server/scripts/EasternKingdoms/stormwind_city.cpp
  183. +1 −1  src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
  184. +1 −1  src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
  185. +3 −3 src/server/scripts/EasternKingdoms/western_plaguelands.cpp
  186. +2 −2 src/server/scripts/EasternKingdoms/westfall.cpp
  187. +1 −1  src/server/scripts/EasternKingdoms/wetlands.cpp
  188. +2 −2 src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
  189. +4 −4 src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
  190. +1 −1  src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_aeonus.cpp
  191. +1 −1  src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_chrono_lord_deja.cpp
  192. +1 −1  src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/boss_temporus.cpp
  193. +3 −3 src/server/scripts/Kalimdor/CavernsOfTime/dark_portal/instance_dark_portal.cpp
  194. +2 −2 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/boss_archimonde.cpp
  195. +2 −2 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal.cpp
  196. +7 −7 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjalAI.cpp
  197. +3 −3 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/hyjal_trash.cpp
  198. +5 −5 src/server/scripts/Kalimdor/CavernsOfTime/hyjal/instance_hyjal.cpp
  199. +1 −1  src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_captain_skarloc.cpp
  200. +3 −3 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_epoch_hunter.cpp
  201. +1 −1  src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/boss_leutenant_drake.cpp
  202. +4 −4 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/instance_old_hillsbrad.cpp
  203. +4 −4 src/server/scripts/Kalimdor/CavernsOfTime/old_hillsbrad/old_hillsbrad.cpp
  204. +5 −5 src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
  205. +2 −2 src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
  206. +1 −1  src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
  207. +2 −2 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
  208. +4 −4 src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
  209. +3 −3 src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
  210. +3 −3 src/server/scripts/Kalimdor/ashenvale.cpp
  211. +2 −2 src/server/scripts/Kalimdor/azuremyst_isle.cpp
  212. +1 −1  src/server/scripts/Kalimdor/darkshore.cpp
  213. +1 −1  src/server/scripts/Kalimdor/desolace.cpp
  214. +8 −8 src/server/scripts/Kalimdor/dustwallow_marsh.cpp
  215. +12 −12 src/server/scripts/Kalimdor/moonglade.cpp
  216. +1 −1  src/server/scripts/Kalimdor/mulgore.cpp
  217. +1 −1  src/server/scripts/Kalimdor/silithus.cpp
  218. +1 −1  src/server/scripts/Kalimdor/stonetalon_mountains.cpp
  219. +3 −3 src/server/scripts/Kalimdor/tanaris.cpp
  220. +1 −1  src/server/scripts/Kalimdor/teldrassil.cpp
  221. +4 −4 src/server/scripts/Kalimdor/the_barrens.cpp
  222. +4 −4 src/server/scripts/Kalimdor/thousand_needles.cpp
  223. +1 −1  src/server/scripts/Kalimdor/ungoro_crater.cpp
  224. +2 −2 src/server/scripts/Outland/Auchindoun/mana_tombs/boss_nexusprince_shaffar.cpp
  225. +2 −2 src/server/scripts/Outland/Auchindoun/mana_tombs/boss_pandemonius.cpp
  226. +2 −2 src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
  227. +2 −2 src/server/scripts/Outland/Auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
  228. +4 −4 src/server/scripts/Outland/Auchindoun/sethekk_halls/instance_sethekk_halls.cpp
  229. +2 −2 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
  230. +2 −2 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
  231. +2 −2 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
  232. +4 −4 src/server/scripts/Outland/Auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
  233. +1 −1  src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
  234. +16 −16 src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
  235. +1 −1  src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
  236. +1 −1  src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
  237. +2 −2 src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
  238. +3 −3 src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
  239. +2 −2 src/server/scripts/Outland/BlackTemple/illidari_council.cpp
  240. +5 −5 src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
  241. +2 −2 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_fathomlord_karathress.cpp
  242. +3 −3 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_hydross_the_unstable.cpp
  243. +5 −5 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_lady_vashj.cpp
  244. +3 −3 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_leotheras_the_blind.cpp
  245. +4 −4 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/boss_morogrim_tidewalker.cpp
  246. +5 −5 src/server/scripts/Outland/CoilfangReservoir/serpent_shrine/instance_serpent_shrine.cpp
  247. +2 −2 src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_hydromancer_thespia.cpp
  248. +2 −2 src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_mekgineer_steamrigger.cpp
  249. +2 −2 src/server/scripts/Outland/CoilfangReservoir/steam_vault/boss_warlord_kalithresh.cpp
  250. +5 −5 src/server/scripts/Outland/CoilfangReservoir/steam_vault/instance_steam_vault.cpp
  251. +3 −3 src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
  252. +2 −2 src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
  253. +5 −5 src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
  254. +2 −2 src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_kelidan_the_breaker.cpp
  255. +2 −2 src/server/scripts/Outland/HellfireCitadel/blood_furnace/boss_the_maker.cpp
  256. +4 −4 src/server/scripts/Outland/HellfireCitadel/blood_furnace/instance_blood_furnace.cpp
  257. +1 −1  src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
  258. +3 −3 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
  259. +2 −2 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
  260. +2 −2 src/server/scripts/Outland/HellfireCitadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
  261. +5 −5 src/server/scripts/Outland/HellfireCitadel/magtheridons_lair/instance_magtheridons_lair.cpp
  262. +3 −3 src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_nethekurse.cpp
  263. +1 −1  src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warbringer_omrogg.cpp
  264. +2 −2 src/server/scripts/Outland/HellfireCitadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
  265. +6 −6 src/server/scripts/Outland/HellfireCitadel/shattered_halls/instance_shattered_halls.cpp
  266. +8 −8 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
  267. +4 −4 src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
  268. +4 −4 src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
  269. +3 −3 src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
  270. +2 −2 src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
  271. +2 −2 src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
  272. +1 −1  src/server/scripts/Outland/TempestKeep/the_eye/boss_alar.cpp
  273. +3 −3 src/server/scripts/Outland/TempestKeep/the_eye/boss_astromancer.cpp
  274. +5 −5 src/server/scripts/Outland/TempestKeep/the_eye/boss_kaelthas.cpp
  275. +2 −2 src/server/scripts/Outland/TempestKeep/the_eye/boss_void_reaver.cpp
  276. +4 −4 src/server/scripts/Outland/TempestKeep/the_eye/instance_the_eye.cpp
  277. +2 −2 src/server/scripts/Outland/TempestKeep/the_mechanar/boss_gatewatcher_ironhand.cpp
  278. +2 −2 src/server/scripts/Outland/TempestKeep/the_mechanar/boss_nethermancer_sepethrea.cpp
  279. +2 −2 src/server/scripts/Outland/TempestKeep/the_mechanar/boss_pathaleon_the_calculator.cpp
  280. +2 −2 src/server/scripts/Outland/TempestKeep/the_mechanar/instance_mechanar.cpp
  281. +7 −7 src/server/scripts/Outland/blades_edge_mountains.cpp
  282. +2 −2 src/server/scripts/Outland/boss_doomlord_kazzak.cpp
  283. +3 −3 src/server/scripts/Outland/boss_doomwalker.cpp
  284. +7 −7 src/server/scripts/Outland/hellfire_peninsula.cpp
  285. +6 −6 src/server/scripts/Outland/nagrand.cpp
  286. +10 −10 src/server/scripts/Outland/netherstorm.cpp
  287. +10 −10 src/server/scripts/Outland/shadowmoon_valley.cpp
  288. +11 −11 src/server/scripts/Outland/shattrath_city.cpp
  289. +9 −9 src/server/scripts/Outland/terokkar_forest.cpp
  290. +2 −2 src/server/scripts/Outland/zangarmarsh.cpp
  291. +6 −6 src/server/scripts/World/go_scripts.cpp
  292. +3 −3 src/server/scripts/World/item_scripts.cpp
  293. +15 −15 src/server/scripts/World/npc_professions.cpp
  294. +2 −2 src/server/scripts/World/npc_taxi.cpp
  295. +8 −8 src/server/scripts/World/npcs_special.cpp
  296. +4 −4 src/server/shared/CMakeLists.txt
  297. +3 −3 src/server/shared/DataStores/DBCFileLoader.cpp
  298. +3 −3 src/server/shared/Database/SQLStorageImpl.h
  299. +3 −3 src/server/shared/Debugging/Errors.h
  300. +4 −4 src/server/shared/Debugging/WheatyExceptionReport.cpp
Sorry, we could not display the entire diff because too many files (323) changed.
View
8 CMakeLists.txt
@@ -28,7 +28,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/macros")
# build in Release-mode by default if not explicitly set
-if( NOT CMAKE_BUILD_TYPE )
+if ( NOT CMAKE_BUILD_TYPE )
set(CMAKE_BUILD_TYPE "Release")
endif()
@@ -39,7 +39,7 @@ include(CheckIncludeFiles)
include(cmake/options.cmake)
# turn off PCH totally if enabled (hidden setting, mainly for devs)
-if( NOPCH )
+if ( NOPCH )
set(USE_COREPCH 0)
set(USE_SCRIPTPCH 0)
endif()
@@ -50,11 +50,11 @@ include(CheckPlatform)
find_package(PCHSupport)
find_package(ACE REQUIRED)
find_package(OpenSSL REQUIRED)
-if( NOT USE_MYSQL_SOURCES )
+if ( NOT USE_MYSQL_SOURCES )
find_package(MySQL REQUIRED)
endif()
-if( UNIX )
+if ( UNIX )
find_package(Readline)
find_package(ZLIB)
find_package(BZip2)
View
2  dep/acelite/ace/ACE.cpp
@@ -2172,7 +2172,7 @@ ACE::handle_ready (ACE_HANDLE handle,
fds.fd = handle;
fds.events = read_ready ? POLLIN : 0;
- if( write_ready )
+ if ( write_ready )
{
fds.events |= POLLOUT;
}
View
2  dep/acelite/ace/Basic_Types.cpp
@@ -37,7 +37,7 @@ ACE_U_LongLong::as_string (ACE_TCHAR *output,
}
else
{
- switch(base)
+ switch (base)
{
case 8:
{
View
2  dep/acelite/ace/CMakeLists.txt
@@ -332,7 +332,7 @@ add_definitions(-DACE_BUILD_DLL)
add_library(ace SHARED ${ace_STAT_SRCS})
-if( WIN32 )
+if ( WIN32 )
if (MSYS OR MINGW)
find_library(WS2_32_LIBRARY ws2_32)
target_link_libraries(ace ${WS2_32_LIBRARY})
View
2  dep/acelite/ace/Configuration_Import_Export.cpp
@@ -374,7 +374,7 @@ ACE_Registry_ImpExp::process_previous_line_format (ACE_TCHAR* buffer,
if (*end == '\"')
{
// string type
- if(config_.set_string_value (section, buffer, end + 1))
+ if (config_.set_string_value (section, buffer, end + 1))
return -4;
}
else if (*end == '#')
View
2  dep/acelite/ace/IOStream.cpp
@@ -161,7 +161,7 @@ ACE_Streambuf::underflow (void)
if (out_waiting () && syncout () == EOF)
return EOF;
- if( ! pbase() )
+ if ( ! pbase() )
{
delete [] pbase_saved_;
(void) reset_put_buffer();
View
2  dep/acelite/ace/Log_Msg.cpp
@@ -1935,7 +1935,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
(bp, bspace, format, wchar_t_str);
else
this_len = ACE_OS::sprintf (bp, format, wchar_t_str);
- if(sizeof(ACE_OS::WChar) != sizeof(wchar_t))
+ if (sizeof(ACE_OS::WChar) != sizeof(wchar_t))
{
delete [] wchar_t_str;
}
View
4 dep/acelite/ace/Message_Block.cpp
@@ -1178,7 +1178,7 @@ ACE_Message_Block::clone (Message_Flags mask) const
ACE_Message_Block *nb = 0;
- if(message_block_allocator_ == 0)
+ if (message_block_allocator_ == 0)
{
ACE_NEW_RETURN (nb,
ACE_Message_Block (0, // size
@@ -1208,7 +1208,7 @@ ACE_Message_Block::clone (Message_Flags mask) const
// ACE_NEW_MALLOC_RETURN, there would be a memory leak because the
// above db pointer would be left dangling.
nb = static_cast<ACE_Message_Block*> (message_block_allocator_->malloc (sizeof (ACE_Message_Block)));
- if(nb != 0)
+ if (nb != 0)
new (nb) ACE_Message_Block (0, // size
ACE_Message_Type (0), // type
0, // cont
View
2  dep/acelite/ace/Notification_Queue.cpp
@@ -213,7 +213,7 @@ ACE_Notification_Queue::pop_next_notification(
current = node->get();
free_queue_.push_front(node);
- if(!this->notify_queue_.is_empty())
+ if (!this->notify_queue_.is_empty())
{
more_messages_queued = true;
next = notify_queue_.head()->get();
View
4 dep/acelite/ace/OS_NS_Thread.cpp
@@ -662,7 +662,7 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose)
ptr_ = instance_;
++reference_count_;
}
- else if(purpose == DESTROY)
+ else if (purpose == DESTROY)
{
if (instance_ != 0)
{
@@ -792,7 +792,7 @@ ACE_TSS_Cleanup::thread_exit (void)
if (info.key_in_use () && this_thread_keys->is_set(info.key_))
{
// defer deleting the in-use key until all others have been deleted
- if(info.key_ != this->in_use_)
+ if (info.key_ != this->in_use_)
{
destructor[d_count] = 0;
tss_obj[d_count] = 0;
View
2  dep/acelite/ace/OS_NS_fcntl.cpp
@@ -121,7 +121,7 @@ ACE_OS::open (const char *filename,
return h;
#elif defined (INTEGRITY)
ACE_UNUSED_ARG (sa);
- if(!strcmp(filename,ACE_DEV_NULL)) {
+ if (!strcmp(filename,ACE_DEV_NULL)) {
ACE_OSCALL_RETURN (::AllocateNullConsoleDescriptor(), ACE_HANDLE, -1);
}
else {
View
4 dep/acelite/ace/OS_NS_netdb.cpp
@@ -414,7 +414,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
if (ifr->ifr_addr.sa_family == AF_LINK)
{
- if(ACE_OS::strcmp (ifr->ifr_name, "en0") == 0)
+ if (ACE_OS::strcmp (ifr->ifr_name, "en0") == 0)
{
struct sockaddr_dl* sdl =
(struct sockaddr_dl *) &ifr->ifr_addr;
@@ -427,7 +427,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
ptr += sizeof(ifr->ifr_name);
- if(sizeof(ifr->ifr_addr) > ifr->ifr_addr.sa_len)
+ if (sizeof(ifr->ifr_addr) > ifr->ifr_addr.sa_len)
ptr += sizeof(ifr->ifr_addr);
else
ptr += ifr->ifr_addr.sa_len;
View
2  dep/acelite/ace/OS_NS_sys_utsname.cpp
@@ -225,7 +225,7 @@ ACE_OS::uname (ACE_utsname *name)
return ACE_OS::hostname (name->nodename, maxnamelen);
#elif defined (INTEGRITY)
- if(!name) {
+ if (!name) {
errno = EFAULT;
return -1;
}
View
2  dep/acelite/ace/OS_NS_time.cpp
@@ -270,7 +270,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
res->tm_hour = systime.wHour;
- if(pTz.DaylightBias!=0)
+ if (pTz.DaylightBias!=0)
res->tm_isdst = 1;
else
res->tm_isdst = 1;
View
2  dep/acelite/ace/SOCK_Connector.cpp
@@ -128,7 +128,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
// the select() with ETIME - in this case return
// EWOULDBLOCK so the wait strategy can complete the
// connection.
- if(ACE::handle_timed_complete (new_stream.get_handle (),
+ if (ACE::handle_timed_complete (new_stream.get_handle (),
timeout) == ACE_INVALID_HANDLE)
{
int const tmp = errno;
View
6 dep/acelite/ace/SOCK_Dgram.cpp
@@ -50,7 +50,7 @@ ACE_SOCK_Dgram::recv (iovec *io_vec,
{
ACE_TRACE ("ACE_SOCK_Dgram::recv");
#if defined (FIONREAD)
- if( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
+ if ( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
{
return -1;
}
@@ -424,7 +424,7 @@ ACE_SOCK_Dgram::recv (void *buf,
int flags,
const ACE_Time_Value *timeout) const
{
- if( ACE::handle_read_ready (this->get_handle (), timeout) == 1 )
+ if ( ACE::handle_read_ready (this->get_handle (), timeout) == 1 )
{
// Goes fine, call <recv> to get data
return this->recv (buf, n, addr, flags);
@@ -443,7 +443,7 @@ ACE_SOCK_Dgram::send (const void *buf,
const ACE_Time_Value *timeout) const
{
// Check the status of the current socket.
- if( ACE::handle_write_ready (this->get_handle (), timeout) == 1 )
+ if ( ACE::handle_write_ready (this->get_handle (), timeout) == 1 )
{
// Goes fine, call <send> to transmit the data.
return this->send (buf, n, addr, flags);
View
2  dep/acelite/ace/SOCK_IO.cpp
@@ -34,7 +34,7 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
ACE_TRACE ("ACE_SOCK_IO::recvv");
#if defined (FIONREAD)
io_vec->iov_base = 0;
- if( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
+ if ( ACE::handle_read_ready (this->get_handle (), timeout) != 1 )
{
return -1;
}
View
2  dep/acelite/ace/Select_Reactor_Base.cpp
@@ -802,7 +802,7 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer)
return result;
}
- if(more_messages_queued)
+ if (more_messages_queued)
{
(void) ACE::send(this->notification_pipe_.write_handle(),
(char *)&next, sizeof(ACE_Notification_Buffer));
View
6 dep/acelite/ace/Service_Repository.cpp
@@ -212,7 +212,7 @@ ACE_Service_Repository::close (void)
ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->lock_, -1));
#ifndef ACE_NLOGGING
- if(ACE::debug ())
+ if (ACE::debug ())
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@, size=%d\n"),
this,
@@ -228,7 +228,7 @@ ACE_Service_Repository::close (void)
const_cast<ACE_Service_Type *> (this->service_array_[i]);
#ifndef ACE_NLOGGING
- if(ACE::debug ())
+ if (ACE::debug ())
{
if (s == 0)
ACE_DEBUG ((LM_DEBUG,
@@ -256,7 +256,7 @@ ACE_Service_Repository::~ACE_Service_Repository (void)
{
ACE_TRACE ("ACE_Service_Repository::~ACE_Service_Repository");
#ifndef ACE_NLOGGING
- if(ACE::debug ())
+ if (ACE::debug ())
ACE_DEBUG ((LM_DEBUG, "ACE (%P|%t) SR::<dtor>, this=%@\n", this));
#endif
this->close ();
View
4 dep/acelite/ace/Stack_Trace.cpp
@@ -239,7 +239,7 @@ ACE_Stack_Trace::generate_trace (ssize_t starting_frame_offset,
return;
}
- if(prevPc == 0 || prevFp == 0) break;
+ if (prevPc == 0 || prevFp == 0) break;
if (depth >= starting_frame)
{
@@ -399,7 +399,7 @@ add_frame_to_buf (void* pc, void* usrarg)
const char* func = "??";
const char* lib = "??";
- if(dladdr(pc, & info) != 0)
+ if (dladdr(pc, & info) != 0)
{
lib = (const char *) info.dli_fname;
func = (const char *) info.dli_sname;
View
2  dep/acelite/ace/TTY_IO.cpp
@@ -295,7 +295,7 @@ int ACE_TTY_IO::control (Control_Mode cmd, Serial_Params *arg) const
#if defined (IGNBRK)
// If device is not a modem set to ignore break points
- if(arg->modem)
+ if (arg->modem)
devpar.c_iflag &= ~IGNBRK;
else
devpar.c_iflag |= IGNBRK;
View
2  dep/g3dlite/CMakeLists.txt
@@ -54,7 +54,7 @@ set(g3dlib_STAT_SRCS
source/Vector4.cpp
)
-if(WIN32)
+if (WIN32)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/dep/zlib
View
2  dep/g3dlite/source/Any.cpp
@@ -1234,7 +1234,7 @@ void Any::verifySize(int s) const {
}
std::string Any::toString(Type t) {
- switch(t) {
+ switch (t) {
case NONE: return "NONE";
case BOOLEAN: return "BOOLEAN";
case NUMBER: return "NUMBER";
View
32 dep/g3dlite/source/CollisionDetection.cpp
@@ -2179,10 +2179,10 @@ bool CollisionDetection::fixedSolidSphereIntersectsFixedTriangle(
#define FINDMINMAX(x0, x1, x2, min, max) \
min = max = x0; \
- if(x1<min) min=x1;\
- if(x1>max) max=x1;\
- if(x2<min) min=x2;\
- if(x2>max) max=x2;
+ if (x1<min) min=x1;\
+ if (x1>max) max=x1;\
+ if (x2<min) min=x2;\
+ if (x2>max) max=x2;
static bool planeBoxOverlap(const Vector3& normal, const Vector3& vert, const Vector3& maxbox) {
Vector3 vmin, vmax;
@@ -2215,48 +2215,48 @@ static bool planeBoxOverlap(const Vector3& normal, const Vector3& vert, const Ve
#define AXISTEST_X01(a, b, fa, fb) \
p0 = a*v0[Y] - b*v0[Z]; \
p2 = a*v2[Y] - b*v2[Z]; \
- if(p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
+ if (p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
rad = fa * boxhalfsize[Y] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
#define AXISTEST_X2(a, b, fa, fb) \
p0 = a*v0[Y] - b*v0[Z]; \
p1 = a*v1[Y] - b*v1[Z]; \
- if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+ if (p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
rad = fa * boxhalfsize[Y] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
/*======================== Y-tests ========================*/
#define AXISTEST_Y02(a, b, fa, fb) \
p0 = -a*v0[X] + b*v0[Z]; \
p2 = -a*v2[X] + b*v2[Z]; \
- if(p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
+ if (p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
#define AXISTEST_Y1(a, b, fa, fb) \
p0 = -a*v0[X] + b*v0[Z]; \
p1 = -a*v1[X] + b*v1[Z]; \
- if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+ if (p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Z]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
/*======================== Z-tests ========================*/
#define AXISTEST_Z12(a, b, fa, fb) \
p1 = a*v1[X] - b*v1[Y]; \
p2 = a*v2[X] - b*v2[Y]; \
- if(p2<p1) {min=p2; max=p1;} else {min=p1; max=p2;} \
+ if (p2<p1) {min=p2; max=p1;} else {min=p1; max=p2;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Y]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
#define AXISTEST_Z0(a, b, fa, fb) \
p0 = a*v0[X] - b*v0[Y]; \
p1 = a*v1[X] - b*v1[Y]; \
- if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+ if (p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
rad = fa * boxhalfsize[X] + fb * boxhalfsize[Y]; \
- if(min>rad || max<-rad) return false;
+ if (min>rad || max<-rad) return false;
bool CollisionDetection::fixedSolidBoxIntersectsFixedTriangle(
const AABox& box, const Triangle& tri) {
View
2  dep/g3dlite/source/System.cpp
@@ -293,7 +293,7 @@ void System::init() {
switch (pInfo->cputype) {
case CPU_TYPE_POWERPC:
- switch(pInfo->cpusubtype){
+ switch (pInfo->cpusubtype){
case CPU_SUBTYPE_POWERPC_750:
case CPU_SUBTYPE_POWERPC_7400:
case CPU_SUBTYPE_POWERPC_7450:
View
8 dep/g3dlite/source/fileutils.cpp
@@ -178,7 +178,7 @@ int64 fileLength(const std::string& filename) {
if (result == -1) {
#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
std::string zip, contents;
- if(zipfileExists(filename, zip, contents)){
+ if (zipfileExists(filename, zip, contents)){
int64 requiredMem;
struct zip *z = zip_open( zip.c_str(), ZIP_CHECKCONS, NULL );
@@ -299,14 +299,14 @@ static void _zip_resolveDirectory(std::string& completeDir, const std::string& d
completeDir = drive;
int tempLength;
// if the given length is longer than the array, we correct it
- if(length > path.length()){
+ if (length > path.length()){
tempLength = path.length();
} else{
tempLength = length;
}
for(int t = 0; t < tempLength; ++t){
- if(t > 0){
+ if (t > 0){
completeDir += "/";
}
completeDir += path[t];
@@ -320,7 +320,7 @@ static bool _zip_zipContains(const std::string& zipDir, const std::string& desir
//1 is sensitive, 2 is not, 0 is default
int test = zip_name_locate( z, desiredFile.c_str(), ZIP_FL_NOCASE );
zip_close( z );
- if(test == -1){
+ if (test == -1){
return false;
}
return true;
View
2  dep/g3dlite/source/prompt.cpp
@@ -270,7 +270,7 @@ struct PromptParams {
INT_PTR CALLBACK PromptDlgProc(HWND hDlg, UINT msg,
WPARAM wParam, LPARAM lParam) {
- switch(msg) {
+ switch (msg) {
case WM_INITDIALOG:
{
PromptParams *params = (PromptParams*)lParam;
View
2  dep/gsoap/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2011 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/>
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
View
1  dep/gsoap/soapC.cpp
@@ -14,6 +14,7 @@
SOAP_SOURCE_STAMP("@(#) soapC.cpp ver 2.8.2 2011-04-26 21:49:07 GMT")
+
#ifndef WITH_NOGLOBAL
SOAP_FMAC3 void SOAP_FMAC4 soap_serializeheader(struct soap *soap)
View
17 dep/gsoap/soapH.h
@@ -40,6 +40,7 @@ SOAP_FMAC3 char * SOAP_FMAC4 soap_in_byte(struct soap*, const char*, char *, con
#define soap_write_byte(soap, data) ( soap_begin_send(soap) || soap_put_byte(soap, data, "byte", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_byte(struct soap*, const char *, const char*, const char*);
#ifndef soap_read_byte
@@ -59,6 +60,7 @@ SOAP_FMAC3 int * SOAP_FMAC4 soap_in_int(struct soap*, const char*, int *, const
#define soap_write_int(soap, data) ( soap_begin_send(soap) || soap_put_int(soap, data, "int", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_int(struct soap*, const int *, const char*, const char*);
#ifndef soap_read_int
@@ -81,6 +83,7 @@ SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_in_SOAP_ENV__Fault(struct so
#define soap_write_SOAP_ENV__Fault(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Fault(soap, data), 0) || soap_put_SOAP_ENV__Fault(soap, data, "SOAP-ENV:Fault", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Fault(struct soap*, const struct SOAP_ENV__Fault *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Fault
@@ -91,6 +94,7 @@ SOAP_FMAC3 struct SOAP_ENV__Fault * SOAP_FMAC4 soap_get_SOAP_ENV__Fault(struct s
#define soap_new_SOAP_ENV__Fault(soap, n) soap_instantiate_SOAP_ENV__Fault(soap, n, NULL, NULL, NULL)
+
#define soap_delete_SOAP_ENV__Fault(soap, p) soap_delete(soap, p)
SOAP_FMAC1 struct SOAP_ENV__Fault * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Fault(struct soap*, int, const char*, const char*, size_t*);
@@ -112,6 +116,7 @@ SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_in_SOAP_ENV__Reason(struct
#define soap_write_SOAP_ENV__Reason(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Reason(soap, data), 0) || soap_put_SOAP_ENV__Reason(soap, data, "SOAP-ENV:Reason", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Reason(struct soap*, const struct SOAP_ENV__Reason *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Reason
@@ -122,6 +127,7 @@ SOAP_FMAC3 struct SOAP_ENV__Reason * SOAP_FMAC4 soap_get_SOAP_ENV__Reason(struct
#define soap_new_SOAP_ENV__Reason(soap, n) soap_instantiate_SOAP_ENV__Reason(soap, n, NULL, NULL, NULL)
+
#define soap_delete_SOAP_ENV__Reason(soap, p) soap_delete(soap, p)
SOAP_FMAC1 struct SOAP_ENV__Reason * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Reason(struct soap*, int, const char*, const char*, size_t*);
@@ -143,6 +149,7 @@ SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_in_SOAP_ENV__Detail(struct
#define soap_write_SOAP_ENV__Detail(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Detail(soap, data), 0) || soap_put_SOAP_ENV__Detail(soap, data, "SOAP-ENV:Detail", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Detail(struct soap*, const struct SOAP_ENV__Detail *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Detail
@@ -153,6 +160,7 @@ SOAP_FMAC3 struct SOAP_ENV__Detail * SOAP_FMAC4 soap_get_SOAP_ENV__Detail(struct
#define soap_new_SOAP_ENV__Detail(soap, n) soap_instantiate_SOAP_ENV__Detail(soap, n, NULL, NULL, NULL)
+
#define soap_delete_SOAP_ENV__Detail(soap, p) soap_delete(soap, p)
SOAP_FMAC1 struct SOAP_ENV__Detail * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Detail(struct soap*, int, const char*, const char*, size_t*);
@@ -174,6 +182,7 @@ SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_in_SOAP_ENV__Code(struct soap
#define soap_write_SOAP_ENV__Code(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Code(soap, data), 0) || soap_put_SOAP_ENV__Code(soap, data, "SOAP-ENV:Code", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Code(struct soap*, const struct SOAP_ENV__Code *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Code
@@ -184,6 +193,7 @@ SOAP_FMAC3 struct SOAP_ENV__Code * SOAP_FMAC4 soap_get_SOAP_ENV__Code(struct soa
#define soap_new_SOAP_ENV__Code(soap, n) soap_instantiate_SOAP_ENV__Code(soap, n, NULL, NULL, NULL)
+
#define soap_delete_SOAP_ENV__Code(soap, p) soap_delete(soap, p)
SOAP_FMAC1 struct SOAP_ENV__Code * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Code(struct soap*, int, const char*, const char*, size_t*);
@@ -205,6 +215,7 @@ SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_in_SOAP_ENV__Header(struct
#define soap_write_SOAP_ENV__Header(soap, data) ( soap_begin_send(soap) || (soap_serialize_SOAP_ENV__Header(soap, data), 0) || soap_put_SOAP_ENV__Header(soap, data, "SOAP-ENV:Header", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_SOAP_ENV__Header(struct soap*, const struct SOAP_ENV__Header *, const char*, const char*);
#ifndef soap_read_SOAP_ENV__Header
@@ -215,6 +226,7 @@ SOAP_FMAC3 struct SOAP_ENV__Header * SOAP_FMAC4 soap_get_SOAP_ENV__Header(struct
#define soap_new_SOAP_ENV__Header(soap, n) soap_instantiate_SOAP_ENV__Header(soap, n, NULL, NULL, NULL)
+
#define soap_delete_SOAP_ENV__Header(soap, p) soap_delete(soap, p)
SOAP_FMAC1 struct SOAP_ENV__Header * SOAP_FMAC2 soap_instantiate_SOAP_ENV__Header(struct soap*, int, const char*, const char*, size_t*);
@@ -234,6 +246,7 @@ SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_in_ns1__executeCommand(s
#define soap_write_ns1__executeCommand(soap, data) ( soap_begin_send(soap) || (soap_serialize_ns1__executeCommand(soap, data), 0) || soap_put_ns1__executeCommand(soap, data, "ns1:executeCommand", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommand(struct soap*, const struct ns1__executeCommand *, const char*, const char*);
#ifndef soap_read_ns1__executeCommand
@@ -244,6 +257,7 @@ SOAP_FMAC3 struct ns1__executeCommand * SOAP_FMAC4 soap_get_ns1__executeCommand(
#define soap_new_ns1__executeCommand(soap, n) soap_instantiate_ns1__executeCommand(soap, n, NULL, NULL, NULL)
+
#define soap_delete_ns1__executeCommand(soap, p) soap_delete(soap, p)
SOAP_FMAC1 struct ns1__executeCommand * SOAP_FMAC2 soap_instantiate_ns1__executeCommand(struct soap*, int, const char*, const char*, size_t*);
@@ -261,6 +275,7 @@ SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_in_ns1__executeC
#define soap_write_ns1__executeCommandResponse(soap, data) ( soap_begin_send(soap) || (soap_serialize_ns1__executeCommandResponse(soap, data), 0) || soap_put_ns1__executeCommandResponse(soap, data, "ns1:executeCommandResponse", NULL) || soap_end_send(soap) )
#endif
+
SOAP_FMAC3 int SOAP_FMAC4 soap_put_ns1__executeCommandResponse(struct soap*, const struct ns1__executeCommandResponse *, const char*, const char*);
#ifndef soap_read_ns1__executeCommandResponse
@@ -271,6 +286,7 @@ SOAP_FMAC3 struct ns1__executeCommandResponse * SOAP_FMAC4 soap_get_ns1__execute
#define soap_new_ns1__executeCommandResponse(soap, n) soap_instantiate_ns1__executeCommandResponse(soap, n, NULL, NULL, NULL)
+
#define soap_delete_ns1__executeCommandResponse(soap, p) soap_delete(soap, p)
SOAP_FMAC1 struct ns1__executeCommandResponse * SOAP_FMAC2 soap_instantiate_ns1__executeCommandResponse(struct soap*, int, const char*, const char*, size_t*);
@@ -370,6 +386,7 @@ SOAP_FMAC3 char *** SOAP_FMAC4 soap_get_PointerTostring(struct soap*, char ***,
#define soap_default__QName(soap, a) soap_default_string(soap, a)
+
#define soap_serialize__QName(soap, a) soap_serialize_string(soap, a)
SOAP_FMAC3 int SOAP_FMAC4 soap_out__QName(struct soap*, const char*, int, char*const*, const char*);
View
1  dep/gsoap/soapServer.cpp
@@ -13,6 +13,7 @@
SOAP_SOURCE_STAMP("@(#) soapServer.cpp ver 2.8.2 2011-04-26 21:49:07 GMT")
+
SOAP_FMAC5 int SOAP_FMAC6 soap_serve(struct soap *soap)
{
#ifndef WITH_FASTCGI
View
6 dep/gsoap/soapStub.h
@@ -15,18 +15,21 @@
* *
\******************************************************************************/
+
/******************************************************************************\
* *
* Types with Custom Serializers *
* *
\******************************************************************************/
+
/******************************************************************************\
* *
* Classes and Structs *
* *
\******************************************************************************/
+
#if 0 /* volatile type: do not declare here, declared elsewhere */
#endif
@@ -150,18 +153,21 @@ typedef char *_QName;
typedef char *_XML;
#endif
+
/******************************************************************************\
* *
* Externals *
* *
\******************************************************************************/
+
/******************************************************************************\
* *
* Server-Side Operations *
* *
\******************************************************************************/
+
SOAP_FMAC5 int SOAP_FMAC6 ns1__executeCommand(struct soap*, char *command, char **result);
/******************************************************************************\
View
27 dep/gsoap/stdsoap2.h
@@ -155,7 +155,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif
#endif
-#ifdef __SYMBIAN32__
+#ifdef __SYMBIAN32__
# define SYMBIAN
# undef WIN32
#endif
@@ -174,7 +174,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
#if defined(__digital__) && defined(__unix__)
# ifndef TRU64
-# define TRU64
+# define TRU64
# endif
#endif
@@ -566,15 +566,15 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# include <netinet\in.h>
# include <netdb.h>
# include <stdio.h>
-# include <fcntl.h>
-# include <string.h>
-# include <stdlib.h>
-# include <memory.h>
-# include <errno.h>
+# include <fcntl.h>
+# include <string.h>
+# include <stdlib.h>
+# include <memory.h>
+# include <errno.h>
# include <cextdecs.h(TIME,FILE_CLOSE_,AWAITIOX,DELAY,FILEINFO,FILE_GETINFO_)>
-# define INET_ERROR 4294967295
-#pragma list
-#endif
+# define INET_ERROR 4294967295
+#pragma list
+#endif
#ifndef WITH_NOSTDLIB
# include <stdlib.h>
@@ -1006,7 +1006,7 @@ extern "C" {
# ifdef WMW_RPM_IO
# include "httpLib.h"
# endif
-# ifdef __INCmathh
+# ifdef __INCmathh
# include <private/mathP.h>
# ifndef HAVE_ISNAN
# define HAVE_ISNAN
@@ -1020,7 +1020,7 @@ extern "C" {
# endif
#endif
-#ifdef WIN32
+#ifdef WIN32
# include <float.h>
# ifndef HAVE_ISNAN
# define HAVE_ISNAN
@@ -2260,7 +2260,7 @@ SOAP_FMAC1 char* SOAP_FMAC2 soap_putsizesoffsets(struct soap*, const char *, con
SOAP_FMAC1 char* SOAP_FMAC2 soap_putsizes(struct soap*, const char *, const int *, int);
SOAP_FMAC1 char* SOAP_FMAC2 soap_putoffset(struct soap*, int);
SOAP_FMAC1 char* SOAP_FMAC2 soap_putoffsets(struct soap*, const int *, int);
-
+
SOAP_FMAC1 int SOAP_FMAC2 soap_closesock(struct soap*);
SOAP_FMAC1 struct soap *SOAP_FMAC2 soap_new(void);
@@ -2432,6 +2432,7 @@ SOAP_FMAC1 const char* SOAP_FMAC2 soap_base642s(struct soap*, const char*, char*
SOAP_FMAC1 const char* SOAP_FMAC2 soap_hex2s(struct soap*, const char*, char*, size_t, int*);
#endif
+
SOAP_FMAC1 int* SOAP_FMAC2 soap_inint(struct soap*, const char *tag, int *p, const char *, int);
SOAP_FMAC1 char* SOAP_FMAC2 soap_inbyte(struct soap*, const char *tag, char *p, const char *, int);
SOAP_FMAC1 long* SOAP_FMAC2 soap_inlong(struct soap*, const char *tag, long *p, const char *, int);
View
10 dep/mysqllite/CMakeLists.txt
@@ -30,7 +30,7 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_DEBUG ENABLED_DEBUG_SYNC
# Set DBUG_OFF and other optional release-only flags for non-debug project types
foreach(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_${BUILD_TYPE} DBUG_OFF)
- if(WITH_FAST_MUTEXES)
+ if (WITH_FAST_MUTEXES)
set_directory_properties(PROPERTIES COMPILE_DEFINITIONS_${BUILD_TYPE} "MY_PTHREAD_FASTMUTEX=1")
endif()
endforeach()
@@ -111,7 +111,7 @@ set(STRINGS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/strings/strcont.c
${CMAKE_CURRENT_SOURCE_DIR}/strings/strappend.c
)
-if(NOT HAVE_STRNLEN)
+if (NOT HAVE_STRNLEN)
# OSX does not have strnlen
set(STRINGS_SOURCES ${STRINGS_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/strings/strnlen.c)
endif()
@@ -229,13 +229,13 @@ set(MYSYS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_windac.c
${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_conio.c
)
-if(HAVE_ALARM)
+if (HAVE_ALARM)
set(MYSYS_SOURCES ${MYSYS_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_alarm.c)
endif()
-if(HAVE_LARGE_PAGES)
+if (HAVE_LARGE_PAGES)
set(MYSYS_SOURCES ${MYSYS_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_largepage.c)
endif()
-if(HAVE_MLOCK)
+if (HAVE_MLOCK)
set(MYSYS_SOURCES ${MYSYS_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/mysys/my_lockmem.c)
endif()
View
4 dep/mysqllite/dbug/dbug.c
@@ -683,7 +683,7 @@ void FixTraceFlags_helper(CODE_STATE *cs, const char *func,
It's ok, because cs->framep may only affect DO_TRACE/DONT_TRACE return
values, but we ignore them here anyway
*/
- switch(DoTrace(cs)) {
+ switch (DoTrace(cs)) {
case ENABLE_TRACE:
framep->level|= TRACE_ON;
break;
@@ -1658,7 +1658,7 @@ static int DoTrace(CODE_STATE *cs)
{
if ((cs->stack->maxdepth == 0 || cs->level <= cs->stack->maxdepth) &&
InList(cs->stack->processes, cs->process) & (MATCHED|INCLUDE))
- switch(InList(cs->stack->functions, cs->func)) {
+ switch (InList(cs->stack->functions, cs->func)) {
case INCLUDE|SUBDIR: return ENABLE_TRACE;
case INCLUDE: return DO_TRACE;
case MATCHED|SUBDIR:
View
2  dep/mysqllite/mysys/default.c
@@ -942,7 +942,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
{
if (*value == '\\' && value != value_end-1)
{
- switch(*++value) {
+ switch (*++value) {
case 'n':
*ptr++='\n';
break;
View
6 dep/mysqllite/mysys/mf_keycache.c
@@ -564,7 +564,7 @@ int resize_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
if (!keycache->key_cache_inited)
DBUG_RETURN(keycache->disk_blocks);
- if(key_cache_block_size == keycache->key_cache_block_size &&
+ if (key_cache_block_size == keycache->key_cache_block_size &&
use_mem == keycache->key_cache_mem_size)
{
change_key_cache_param(keycache, division_limit, age_threshold);
@@ -3309,13 +3309,13 @@ static void free_block(KEY_CACHE *keycache, BLOCK_LINK *block)
/* Assert that the block is not in the LRU ring. */
DBUG_ASSERT(!block->next_used && !block->prev_used);
/*
- IMHO the below condition (if()) makes no sense. I can't see how it
+ IMHO the below condition (if ()) makes no sense. I can't see how it
could be possible that free_block() is entered with a NULL hash_link
pointer. The only place where it can become NULL is in free_block()
(or before its first use ever, but for those blocks free_block() is
not called). I don't remove the conditional as it cannot harm, but
place an DBUG_ASSERT to confirm my hypothesis. Eventually the
- condition (if()) can be removed.
+ condition (if ()) can be removed.
*/
DBUG_ASSERT(block->hash_link && block->hash_link->block == block);
if (block->hash_link)
View
2  dep/mysqllite/mysys/mf_tempfile.c
@@ -73,7 +73,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
*/
if (!dir)
{
- if(GetTempPath(sizeof(path_buf), path_buf) > 0)
+ if (GetTempPath(sizeof(path_buf), path_buf) > 0)
dir = path_buf;
}
/*
View
2  dep/mysqllite/mysys/my_fopen.c
@@ -234,7 +234,7 @@ int my_fclose(FILE *fd, myf MyFlags)
#else
err= my_win_fclose(fd);
#endif
- if(err < 0)
+ if (err < 0)
{
my_errno=errno;
if (MyFlags & (MY_FAE | MY_WME))
View
2  dep/mysqllite/mysys/my_gethwaddr.c
@@ -140,7 +140,7 @@ my_bool my_gethwaddr(uchar *to)
static pfnGetAdaptersAddresses fnGetAdaptersAddresses=
(pfnGetAdaptersAddresses)-1;
- if(fnGetAdaptersAddresses == (pfnGetAdaptersAddresses)-1)
+ if (fnGetAdaptersAddresses == (pfnGetAdaptersAddresses)-1)
{
/* Get the function from the DLL */
fnGetAdaptersAddresses= (pfnGetAdaptersAddresses)
View
4 dep/mysqllite/mysys/my_pread.c
@@ -74,7 +74,7 @@ size_t my_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset,
#endif
error= (readbytes != Count);
#endif
- if(error)
+ if (error)
{
my_errno= errno ? errno : -1;
if (errno == 0 || (readbytes != (size_t) -1 &&
@@ -158,7 +158,7 @@ size_t my_pwrite(File Filedes, const uchar *Buffer, size_t Count,
#else
writtenbytes= pwrite(Filedes, Buffer, Count, offset);
#endif
- if(writtenbytes == Count)
+ if (writtenbytes == Count)
break;
my_errno= errno;
if (writtenbytes != (size_t) -1)
View
2  dep/mysqllite/mysys/my_quick.c
@@ -31,7 +31,7 @@ size_t my_quick_read(File Filedes,uchar *Buffer,size_t Count,myf MyFlags)
#else
readbytes= read(Filedes, Buffer, Count);
#endif
- if(readbytes != Count)
+ if (readbytes != Count)
{
#ifndef DBUG_OFF
if ((readbytes == 0 || readbytes == (size_t) -1) && errno == EINTR)
View
6 dep/mysqllite/mysys/my_wincond.c
@@ -140,7 +140,7 @@ static int legacy_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr
TRUE, /* signaled initially */
NULL); /* unnamed */
- if( cond->events[SIGNAL] == NULL ||
+ if ( cond->events[SIGNAL] == NULL ||
cond->events[BROADCAST] == NULL ||
cond->broadcast_block_event == NULL )
return ENOMEM;
@@ -204,7 +204,7 @@ static int legacy_cond_signal(pthread_cond_t *cond)
{
EnterCriticalSection(&cond->lock_waiting);
- if(cond->waiting > 0)
+ if (cond->waiting > 0)
SetEvent(cond->events[SIGNAL]);
LeaveCriticalSection(&cond->lock_waiting);
@@ -220,7 +220,7 @@ static int legacy_cond_broadcast(pthread_cond_t *cond)
there isn't any thread waiting to open the
block gate after this call has closed it.
*/
- if(cond->waiting > 0)
+ if (cond->waiting > 0)
{
/* Close block gate */
ResetEvent(cond->broadcast_block_event);
View
72 dep/mysqllite/mysys/my_winfile.c
@@ -60,7 +60,7 @@ File my_open_osfhandle(HANDLE handle, int oflag)
mysql_mutex_lock(&THR_LOCK_open);
for(i= MY_FILE_MIN; i < my_file_limit;i++)
{
- if(my_file_info[i].fhandle == 0)
+ if (my_file_info[i].fhandle == 0)
{
struct st_my_file_info *finfo= &(my_file_info[i]);
finfo->type= FILE_BY_OPEN;
@@ -71,7 +71,7 @@ File my_open_osfhandle(HANDLE handle, int oflag)
}
}
mysql_mutex_unlock(&THR_LOCK_open);
- if(offset == -1)
+ if (offset == -1)
errno= EMFILE; /* to many file handles open */
DBUG_RETURN(offset);
}
@@ -274,7 +274,7 @@ File my_win_open(const char *path, int flags)
int my_win_close(File fd)
{
DBUG_ENTER("my_win_close");
- if(CloseHandle(my_get_osfhandle(fd)))
+ if (CloseHandle(my_get_osfhandle(fd)))
{
invalidate_fd(fd);
DBUG_RETURN(0);
@@ -292,10 +292,10 @@ size_t my_win_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset)
DBUG_ENTER("my_win_pread");
- if(!Count)
+ if (!Count)
DBUG_RETURN(0);
#ifdef _WIN64
- if(Count > UINT_MAX)
+ if (Count > UINT_MAX)
Count= UINT_MAX;
#endif
@@ -304,14 +304,14 @@ size_t my_win_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset)
ov.Offset= li.LowPart;
ov.OffsetHigh= li.HighPart;
- if(!ReadFile(hFile, Buffer, (DWORD)Count, &nBytesRead, &ov))
+ if (!ReadFile(hFile, Buffer, (DWORD)Count, &nBytesRead, &ov))
{
DWORD lastError= GetLastError();
/*
ERROR_BROKEN_PIPE is returned when no more data coming
through e.g. a command pipe in windows : see MSDN on ReadFile.
*/
- if(lastError == ERROR_HANDLE_EOF || lastError == ERROR_BROKEN_PIPE)
+ if (lastError == ERROR_HANDLE_EOF || lastError == ERROR_BROKEN_PIPE)
DBUG_RETURN(0); /*return 0 at EOF*/
my_osmaperr(lastError);
DBUG_RETURN((size_t)-1);
@@ -325,23 +325,23 @@ size_t my_win_read(File Filedes, uchar *Buffer, size_t Count)
HANDLE hFile;
DBUG_ENTER("my_win_read");
- if(!Count)
+ if (!Count)
DBUG_RETURN(0);
#ifdef _WIN64
- if(Count > UINT_MAX)
+ if (Count > UINT_MAX)
Count= UINT_MAX;
#endif
hFile= (HANDLE)my_get_osfhandle(Filedes);
- if(!ReadFile(hFile, Buffer, (DWORD)Count, &nBytesRead, NULL))
+ if (!ReadFile(hFile, Buffer, (DWORD)Count, &nBytesRead, NULL))
{
DWORD lastError= GetLastError();
/*
ERROR_BROKEN_PIPE is returned when no more data coming
through e.g. a command pipe in windows : see MSDN on ReadFile.
*/
- if(lastError == ERROR_HANDLE_EOF || lastError == ERROR_BROKEN_PIPE)
+ if (lastError == ERROR_HANDLE_EOF || lastError == ERROR_BROKEN_PIPE)
DBUG_RETURN(0); /*return 0 at EOF*/
my_osmaperr(lastError);
DBUG_RETURN((size_t)-1);
@@ -361,11 +361,11 @@ size_t my_win_pwrite(File Filedes, const uchar *Buffer, size_t Count,
DBUG_PRINT("my",("Filedes: %d, Buffer: %p, Count: %llu, offset: %llu",
Filedes, Buffer, (ulonglong)Count, (ulonglong)offset));
- if(!Count)
+ if (!Count)
DBUG_RETURN(0);
#ifdef _WIN64
- if(Count > UINT_MAX)
+ if (Count > UINT_MAX)
Count= UINT_MAX;
#endif
@@ -374,7 +374,7 @@ size_t my_win_pwrite(File Filedes, const uchar *Buffer, size_t Count,
ov.Offset= li.LowPart;
ov.OffsetHigh= li.HighPart;
- if(!WriteFile(hFile, Buffer, (DWORD)Count, &nBytesWritten, &ov))
+ if (!WriteFile(hFile, Buffer, (DWORD)Count, &nBytesWritten, &ov))
{
my_osmaperr(GetLastError());
DBUG_RETURN((size_t)-1);
@@ -395,7 +395,7 @@ my_off_t my_win_lseek(File fd, my_off_t pos, int whence)
&& FILE_END == SEEK_END);
offset.QuadPart= pos;
- if(!SetFilePointerEx(my_get_osfhandle(fd), offset, &newpos, whence))
+ if (!SetFilePointerEx(my_get_osfhandle(fd), offset, &newpos, whence))
{
my_osmaperr(GetLastError());
newpos.QuadPart= -1;
@@ -417,15 +417,15 @@ size_t my_win_write(File fd, const uchar *Buffer, size_t Count)
DBUG_PRINT("my",("Filedes: %d, Buffer: %p, Count %llu", fd, Buffer,
(ulonglong)Count));
- if(!Count)
+ if (!Count)
DBUG_RETURN(0);
#ifdef _WIN64
- if(Count > UINT_MAX)
+ if (Count > UINT_MAX)
Count= UINT_MAX;
#endif
- if(my_get_open_flags(fd) & _O_APPEND)
+ if (my_get_open_flags(fd) & _O_APPEND)
{
/*
Atomic append to the end of file is is done by special initialization of
@@ -438,7 +438,7 @@ size_t my_win_write(File fd, const uchar *Buffer, size_t Count)
}
hFile= my_get_osfhandle(fd);
- if(!WriteFile(hFile, Buffer, (DWORD)Count, &nWritten, pov))
+ if (!WriteFile(hFile, Buffer, (DWORD)Count, &nWritten, pov))
{
my_osmaperr(GetLastError());
DBUG_RETURN((size_t)-1);
@@ -472,17 +472,17 @@ static File my_get_stdfile_descriptor(FILE *stream)
DWORD nStdHandle;
DBUG_ENTER("my_get_stdfile_descriptor");
- if(stream == stdin)
+ if (stream == stdin)
nStdHandle= STD_INPUT_HANDLE;
- else if(stream == stdout)
+ else if (stream == stdout)
nStdHandle= STD_OUTPUT_HANDLE;
- else if(stream == stderr)
+ else if (stream == stderr)
nStdHandle= STD_ERROR_HANDLE;
else
DBUG_RETURN(-1);
hFile= GetStdHandle(nStdHandle);
- if(hFile != INVALID_HANDLE_VALUE)
+ if (hFile != INVALID_HANDLE_VALUE)
DBUG_RETURN(my_open_osfhandle(hFile, 0));
DBUG_RETURN(-1);
}
@@ -497,13 +497,13 @@ File my_win_fileno(FILE *file)
for(i= MY_FILE_MIN; i < my_file_limit; i++)
{
- if(my_file_info[i].fhandle == hFile)
+ if (my_file_info[i].fhandle == hFile)
{
retval= i;
break;
}
}
- if(retval == -1)
+ if (retval == -1)
/* try std stream */
DBUG_RETURN(my_get_stdfile_descriptor(file));
DBUG_RETURN(retval);
@@ -527,17 +527,17 @@ FILE *my_win_fopen(const char *filename, const char *type)
}
file= fopen(filename, type);
- if(!file)
+ if (!file)
DBUG_RETURN(NULL);
- if(strchr(type,'a') != NULL)
+ if (strchr(type,'a') != NULL)
flags= O_APPEND;
/*
Register file handle in my_table_info.
Necessary for my_fileno()
*/
- if(my_open_osfhandle((HANDLE)_get_osfhandle(fileno(file)), flags) < 0)
+ if (my_open_osfhandle((HANDLE)_get_osfhandle(fileno(file)), flags) < 0)
{
fclose(file);
DBUG_RETURN(NULL);
@@ -553,11 +553,11 @@ FILE * my_win_fdopen(File fd, const char *type)
DBUG_ENTER("my_win_fdopen");
- if(strchr(type,'a') != NULL)
+ if (strchr(type,'a') != NULL)
flags= O_APPEND;
/* Convert OS file handle to CRT file descriptor and then call fdopen*/
crt_fd= _open_osfhandle((intptr_t)my_get_osfhandle(fd), flags);
- if(crt_fd < 0)
+ if (crt_fd < 0)
file= NULL;
else
file= fdopen(crt_fd, type);
@@ -570,9 +570,9 @@ int my_win_fclose(FILE *file)
DBUG_ENTER("my_win_close");
fd= my_fileno(file);
- if(fd < 0)
+ if (fd < 0)
DBUG_RETURN(-1);
- if(fclose(file) < 0)
+ if (fclose(file) < 0)
DBUG_RETURN(-1);
invalidate_fd(fd);
DBUG_RETURN(0);
@@ -593,7 +593,7 @@ int my_win_fstat(File fd, struct _stati64 *buf)
DBUG_ENTER("my_win_fstat");
hFile= my_get_osfhandle(fd);
- if(!DuplicateHandle( GetCurrentProcess(), hFile, GetCurrentProcess(),
+ if (!DuplicateHandle( GetCurrentProcess(), hFile, GetCurrentProcess(),
&hDup ,0,FALSE,DUPLICATE_SAME_ACCESS))
{
my_osmaperr(GetLastError());
@@ -603,7 +603,7 @@ int my_win_fstat(File fd, struct _stati64 *buf)
DBUG_RETURN(-1);
retval= _fstati64(crt_fd, buf);
- if(retval == 0)
+ if (retval == 0)
{
/* File size returned by stat is not accurate (may be outdated), fix it*/
GetFileSizeEx(hDup, (PLARGE_INTEGER) (&(buf->st_size)));
@@ -615,7 +615,7 @@ int my_win_fstat(File fd, struct _stati64 *buf)
int my_win_stat( const char *path, struct _stati64 *buf)
{
DBUG_ENTER("my_win_stat");
- if(_stati64( path, buf) == 0)
+ if (_stati64( path, buf) == 0)
{
/* File size returned by stat is not accurate (may be outdated), fix it*/
WIN32_FILE_ATTRIBUTE_DATA data;
@@ -634,7 +634,7 @@ int my_win_stat( const char *path, struct _stati64 *buf)
int my_win_fsync(File fd)
{
DBUG_ENTER("my_win_fsync");
- if(FlushFileBuffers(my_get_osfhandle(fd)))
+ if (FlushFileBuffers(my_get_osfhandle(fd)))
DBUG_RETURN(0);
my_osmaperr(GetLastError());
DBUG_RETURN(-1);
View
6 dep/mysqllite/mysys/my_winthread.c
@@ -112,7 +112,7 @@ int pthread_join(pthread_t thread, void **value_ptr)
ret= WaitForSingleObject(handle, INFINITE);
- if(ret != WAIT_OBJECT_0)
+ if (ret != WAIT_OBJECT_0)
{
errno= EINVAL;
goto error_return;
@@ -122,7 +122,7 @@ int pthread_join(pthread_t thread, void **value_ptr)
return 0;
error_return:
- if(handle)
+ if (handle)
CloseHandle(handle);
return -1;
}
@@ -165,7 +165,7 @@ int my_pthread_once(my_pthread_once_t *once_control,
state= InterlockedCompareExchange(once_control, MY_PTHREAD_ONCE_INPROGRESS,
MY_PTHREAD_ONCE_INIT);
- switch(state)
+ switch (state)
{
case MY_PTHREAD_ONCE_INIT:
/* This is initializer thread */
View
30 dep/mysqllite/mysys/stacktrace.c
@@ -485,7 +485,7 @@ static void get_symbol_path(char *path, size_t size)
*/
GetModuleFileName(NULL, pdb_debug_dir, MAX_PATH);
p= strrchr(pdb_debug_dir, '\\');
- if(p)
+ if (p)
{
*p= 0;
strcat_s(pdb_debug_dir, sizeof(pdb_debug_dir), "\\debug;");
@@ -527,7 +527,7 @@ static void get_symbol_path(char *path, size_t size)
/* Add _NT_SYMBOL_PATH, if present. */
envvar= getenv("_NT_SYMBOL_PATH");
- if(envvar)
+ if (envvar)
{
strcat_s(path, size, envvar);
}
@@ -553,7 +553,7 @@ void my_print_stacktrace(uchar* unused1, ulong unused2)
STACKFRAME64 frame={0};
static char symbol_path[MAX_SYMBOL_PATH];
- if(!exception_ptrs)
+ if (!exception_ptrs)
return;
/* Copy context, as stackwalking on original will unwind the stack */
@@ -593,13 +593,13 @@ void my_print_stacktrace(uchar* unused1, ulong unused2)
BOOL have_symbol= FALSE;
BOOL have_source= FALSE;
- if(!StackWalk64(machine, hProcess, hThread, &frame, &context, 0, 0, 0 ,0))
+ if (!StackWalk64(machine, hProcess, hThread, &frame, &context, 0, 0, 0 ,0))
break;
addr= frame.AddrPC.Offset;
have_module= SymGetModuleInfo64(hProcess,addr,&module);
#ifdef _M_IX86
- if(!have_module)
+ if (!have_module)
{
/*
ModuleInfo structure has been "compatibly" extended in releases after XP,
@@ -616,24 +616,24 @@ void my_print_stacktrace(uchar* unused1, ulong unused2)
have_source= SymGetLineFromAddr64(hProcess, addr, &line_offset, &line);
fprintf(stderr, "%p ", addr);
- if(have_module)
+ if (have_module)
{
char *base_image_name= strrchr(module.ImageName, '\\');
- if(base_image_name)
+ if (base_image_name)
base_image_name++;
else
base_image_name= module.ImageName;
fprintf(stderr, "%s!", base_image_name);
}
- if(have_symbol)
+ if (have_symbol)
fprintf(stderr, "%s()", package.sym.Name);
- else if(have_module)
+ else if (have_module)
fprintf(stderr, "???");
- if(have_source)
+ if (have_source)
{
char *base_file_name= strrchr(line.FileName, '\\');
- if(base_file_name)
+ if (base_file_name)
base_file_name++;
else
base_file_name= line.FileName;
@@ -656,14 +656,14 @@ void my_write_core(int unused)
MINIDUMP_EXCEPTION_INFORMATION info;
HANDLE hFile;
- if(!exception_ptrs)
+ if (!exception_ptrs)
return;
info.ExceptionPointers= exception_ptrs;
info.ClientPointers= FALSE;
info.ThreadId= GetCurrentThreadId();
- if(GetModuleFileName(NULL, path, sizeof(path)))
+ if (GetModuleFileName(NULL, path, sizeof(path)))
{
_splitpath(path, NULL, NULL,dump_fname,NULL);
strncat(dump_fname, ".dmp", sizeof(dump_fname));
@@ -671,10 +671,10 @@ void my_write_core(int unused)
hFile= CreateFile(dump_fname, GENERIC_WRITE, 0, 0, CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL, 0);
- if(hFile)
+ if (hFile)
{
/* Create minidump */
- if(MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(),
+ if (MiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(),
hFile, MiniDumpNormal, &info, 0, 0))
{
fprintf(stderr, "Minidump written to %s\n",
View
4 dep/mysqllite/sql-common/client_plugin.c
@@ -199,7 +199,7 @@ static void load_env_plugins(MYSQL *mysql)
char *plugs, *free_env, *s= getenv("LIBMYSQL_PLUGINS");
/* no plugins to load */
- if(!s)
+ if (!s)
return;
free_env= plugs= my_strdup(s, MYF(MY_WME));
@@ -360,7 +360,7 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
DBUG_PRINT ("info", ("failed to dlopen"));
#ifdef _WIN32
- if(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+ if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
0, GetLastError(), 0, win_errormsg, 2048, NULL))
errmsg= win_errormsg;
else
View
2  dep/mysqllite/strings/ctype.c
@@ -197,7 +197,7 @@ static int cs_leave(MY_XML_PARSER *st,const char *attr, size_t len)
int state= s ? s->state : 0;
int rc;
- switch(state){
+ switch (state){
case _CS_COLLATION:
rc= i->add_collation ? i->add_collation(&i->cs) : MY_XML_OK;
break;
View
2  dep/mysqllite/strings/xml.c
@@ -77,7 +77,7 @@ static char my_xml_ctype[256]=
static const char *lex2str(int lex)
{
- switch(lex)
+ switch (lex)
{
case MY_XML_EOF: return "END-OF-INPUT";
case MY_XML_STRING: return "STRING";
View
4 dep/mysqllite/vio/viosocket.c
@@ -720,7 +720,7 @@ static size_t pipe_complete_io(Vio* vio, char* buf, size_t size, DWORD timeout_m
WaitForSingleObjects will normally return WAIT_OBJECT_O (success, IO completed)
or WAIT_TIMEOUT.
*/
- if(ret != WAIT_OBJECT_0)
+ if (ret != WAIT_OBJECT_0)
{
CancelIo(vio->hPipe);
DBUG_PRINT("error",("WaitForSingleObject() returned %d", ret));
@@ -833,7 +833,7 @@ void vio_win32_timeout(Vio *vio, uint which , uint timeout_sec)
timeout_ms= timeout_sec * 1000;
/* which == 1 means "write", which == 0 means "read".*/
- if(which)
+ if (which)
vio->write_timeout_ms= timeout_ms;
else
vio->read_timeout_ms= timeout_ms;