mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	Remove unnecessary new lines, changed Deinit to Shutdown
This commit is contained in:
		
							parent
							
								
									42928659e8
								
							
						
					
					
						commit
						2b7316a379
					
				
					 5 changed files with 8 additions and 11 deletions
				
			
		|  | @ -76,7 +76,7 @@ void Config::ReadValues() { | |||
|     // Miscellaneous
 | ||||
|     Settings::values.log_filter = glfw_config->Get("Miscellaneous", "log_filter", "*:Info"); | ||||
| 
 | ||||
|     // GDBStubebugging
 | ||||
|     // Debugging
 | ||||
|     Settings::values.use_gdbstub = glfw_config->GetBoolean("Debugging", "use_gdbstub", false); | ||||
|     Settings::values.gdbstub_port = glfw_config->GetInteger("Debugging", "gdbstub_port", 24689); | ||||
| } | ||||
|  |  | |||
|  | @ -3895,7 +3895,6 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) { | |||
|     unsigned int addr; | ||||
|     unsigned int num_instrs = 0; | ||||
| 
 | ||||
| 
 | ||||
|     int ptr; | ||||
| 
 | ||||
|     LOAD_NZCVT; | ||||
|  |  | |||
|  | @ -186,7 +186,7 @@ static u8 ReadByte() { | |||
|     size_t received_size = recv(gdbserver_socket, reinterpret_cast<char*>(&c), 1, MSG_WAITALL); | ||||
|     if (received_size != 1) { | ||||
|         LOG_ERROR(Debug_GDBStub, "recv failed : %ld", received_size); | ||||
|         Deinit(); | ||||
|         Shutdown(); | ||||
|     } | ||||
| 
 | ||||
|     return c; | ||||
|  | @ -322,7 +322,7 @@ static void SendReply(const char* reply) { | |||
|         int sent_size = send(gdbserver_socket, reinterpret_cast<char*>(ptr), left, 0); | ||||
|         if (sent_size < 0) { | ||||
|             LOG_ERROR(Debug_GDBStub, "gdb: send failed"); | ||||
|             return Deinit(); | ||||
|             return Shutdown(); | ||||
|         } | ||||
| 
 | ||||
|         left -= sent_size; | ||||
|  | @ -773,7 +773,7 @@ void HandlePacket() { | |||
|         HandleSignal(); | ||||
|         break; | ||||
|     case 'k': | ||||
|         Deinit(); | ||||
|         Shutdown(); | ||||
|         LOG_INFO(Debug_GDBStub, "killed by gdb"); | ||||
|         return; | ||||
|     case 'g': | ||||
|  | @ -829,7 +829,7 @@ void ToggleServer(bool status) { | |||
|     else { | ||||
|         // Stop server
 | ||||
|         if (IsConnected()) { | ||||
|             Deinit(); | ||||
|             Shutdown(); | ||||
|         } | ||||
| 
 | ||||
|         g_server_enabled = status; | ||||
|  | @ -908,7 +908,7 @@ void Init() { | |||
|     Init(gdbstub_port); | ||||
| } | ||||
| 
 | ||||
| void Deinit() { | ||||
| void Shutdown() { | ||||
|     if (!g_server_enabled) { | ||||
|         return; | ||||
|     } | ||||
|  |  | |||
|  | @ -44,7 +44,7 @@ void ToggleServer(bool status); | |||
| void Init(); | ||||
| 
 | ||||
| /// Stop gdbstub server.
 | ||||
| void Deinit(); | ||||
| void Shutdown(); | ||||
| 
 | ||||
| /// Returns true if there is an active socket connection.
 | ||||
| bool IsConnected(); | ||||
|  |  | |||
|  | @ -24,13 +24,11 @@ void Init(EmuWindow* emu_window) { | |||
|     Kernel::Init(); | ||||
|     HLE::Init(); | ||||
|     VideoCore::Init(emu_window); | ||||
| 
 | ||||
|     GDBStub::Init(); | ||||
| } | ||||
| 
 | ||||
| void Shutdown() { | ||||
|     GDBStub::Deinit(); | ||||
| 
 | ||||
|     GDBStub::Shutdown(); | ||||
|     VideoCore::Shutdown(); | ||||
|     HLE::Shutdown(); | ||||
|     Kernel::Shutdown(); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue