CHANGE: renamed Signal_Device to OS_Signal_Device

Oldes · Oldes · commit f49d969e2861 · 2023-07-03T10:59:00.000+02:00
diff --git a/src/os/dev-dns.c b/src/os/dev-dns.c
@@ -48,8 +48,6 @@
 extern DEVICE_CMD Init_Net(REBREQ *); // Share same init
 extern DEVICE_CMD Quit_Net(REBREQ *);
 
-extern void Signal_Device(REBREQ *req, REBINT type);
-
 #ifdef HAS_ASYNC_DNS
 // Async DNS requires a window handle to signal completion (WSAASync)
 extern HWND Event_Handle;
@@ -164,7 +162,7 @@ extern HWND Event_Handle;
 	sock->net.host_info = 0;
 
 	sock->error = GET_ERROR;
-	//Signal_Device(sock, EVT_ERROR);
+	//OS_Signal_Device(sock, EVT_ERROR);
 	return DR_ERROR; // Remove it from pending list
 }
 
@@ -201,10 +199,10 @@ extern HWND Event_Handle;
 					req->data = (REBYTE*)host->h_name;
 				else
 					COPY_MEM((char*)&(req->net.remote_ip), (char *)(*host->h_addr_list), 4); //he->h_length);
-				Signal_Device(req, EVT_READ);
+				OS_Signal_Device(req, EVT_READ);
 			}
 			else
-				Signal_Device(req, EVT_ERROR);
+				OS_Signal_Device(req, EVT_ERROR);
 			change = TRUE;
 		}
 		else prior = &req->next;
diff --git a/src/os/dev-net.c b/src/os/dev-net.c
@@ -54,7 +54,6 @@
 #define WATCH4(s,a,b,c,d)
 #endif
 
-void Signal_Device(REBREQ *req, REBINT type);
 DEVICE_CMD Listen_Socket(REBREQ *sock);
 
 #ifdef TO_WINDOWS
@@ -214,7 +213,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 	// Failed, get error code (os local):
 	if (result == BAD_SOCKET) {
 		sock->error = GET_ERROR;
-		Signal_Device(sock, EVT_ERROR);
+		OS_Signal_Device(sock, EVT_ERROR);
 		return DR_ERROR;
 	}
 
@@ -225,7 +224,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 	if (!Nonblocking_Mode(sock->socket)) {
 		sock->error = GET_ERROR;
 		CLOSE_SOCKET(sock->socket);
-		Signal_Device(sock, EVT_ERROR);
+		OS_Signal_Device(sock, EVT_ERROR);
 		return DR_ERROR;
 	}
 
@@ -270,7 +269,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 
 		if (CLOSE_SOCKET(sock->socket)) {
 			sock->error = GET_ERROR;
-			Signal_Device(sock, EVT_ERROR);
+			OS_Signal_Device(sock, EVT_ERROR);
 			return DR_ERROR;
 		}
 	}
@@ -306,10 +305,10 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 		if (!sock->error) { // Success!
 			host = (HOSTENT*)sock->net.host_info;
 			COPY_MEM((char*)&(sock->net.remote_ip), (char *)(*host->h_addr_list), 4); //he->h_length);
-			Signal_Device(sock, EVT_LOOKUP);
+			OS_Signal_Device(sock, EVT_LOOKUP);
 		}
 		else
-			Signal_Device(sock, EVT_ERROR);
+			OS_Signal_Device(sock, EVT_ERROR);
 		OS_Free(host);	// free what we allocated earlier
 		sock->socket = sock->length; // Restore TCP socket saved below
 		sock->net.host_info = 0;
@@ -334,13 +333,13 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 	if (host) {
 		COPY_MEM((char*)&(sock->net.remote_ip), (char *)(*host->h_addr_list), 4); //he->h_length);
 		CLR_FLAG(sock->flags, RRF_DONE);
-		Signal_Device(sock, EVT_LOOKUP);
+		OS_Signal_Device(sock, EVT_LOOKUP);
 		return DR_DONE;
 	}
 #endif
 
 	sock->error = GET_ERROR;
-	Signal_Device(sock, EVT_ERROR);
+	OS_Signal_Device(sock, EVT_ERROR);
 	return DR_DONE; // Using DONE instead of ERROR -> https://github.com/Oldes/Rebol-issues/issues/2441
 }
 
@@ -378,7 +377,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 		CLR_FLAG(sock->state, RSM_ATTEMPT);
 		SET_FLAG(sock->state, RSM_CONNECT);
 		Get_Local_IP(sock);
-		Signal_Device(sock, EVT_CONNECT);
+		OS_Signal_Device(sock, EVT_CONNECT);
 		return DR_DONE; // done
 	}
 
@@ -397,7 +396,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 		CLR_FLAG(sock->state, RSM_ATTEMPT);
 		SET_FLAG(sock->state, RSM_CONNECT);
 		Get_Local_IP(sock);
-		Signal_Device(sock, EVT_CONNECT);
+		OS_Signal_Device(sock, EVT_CONNECT);
 		return DR_DONE; // done
 
 #ifdef TO_WINDOWS
@@ -414,7 +413,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 		// An error happened:
 		CLR_FLAG(sock->state, RSM_ATTEMPT);
 		sock->error = result;
-		Signal_Device(sock, EVT_ERROR);
+		OS_Signal_Device(sock, EVT_ERROR);
 		return DR_ERROR;
 	}
 }
@@ -455,7 +454,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 	if (!GET_FLAG(sock->state, RSM_CONNECT)
 			&& !GET_FLAG(sock->modes, RST_UDP)) {
 		sock->error = -18;
-		Signal_Device(sock, EVT_ERROR);
+		OS_Signal_Device(sock, EVT_ERROR);
 		return DR_ERROR;
 	}
 
@@ -492,7 +491,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 			sock->data += result;
 			sock->actual += result;
 			if (sock->actual >= sock->length) {
-				Signal_Device(sock, EVT_WROTE);
+				OS_Signal_Device(sock, EVT_WROTE);
 				return DR_DONE;
 			}
 			SET_FLAG(sock->flags, RRF_ACTIVE); /* notify OS_WAIT of activity */
@@ -511,13 +510,13 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 				sock->net.remote_port = ntohs(remote_addr.sin_port);
 			}
 			sock->actual = (u32)result;
-			Signal_Device(sock, EVT_READ);
+			OS_Signal_Device(sock, EVT_READ);
 			return DR_DONE;
 		}
 		if (result == 0) {		// The socket gracefully closed.
 			sock->actual = 0;
 			CLR_FLAG(sock->state, RSM_CONNECT); // But, keep RRF_OPEN true
-			Signal_Device(sock, EVT_CLOSE);
+			OS_Signal_Device(sock, EVT_CLOSE);
 			return DR_DONE;
 		}
 		// if (result < 0) ...
@@ -533,7 +532,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 	WATCH4("ERROR: recv(%d %x) len: %d error: %d\n", sock->socket, sock->data, len, result);
 	// A nasty error happened:
 	sock->error = (u32)result;
-	Signal_Device(sock, EVT_ERROR);
+	OS_Signal_Device(sock, EVT_ERROR);
 	return DR_ERROR;
 }
 
@@ -564,7 +563,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 	if (result) {
 lserr:
 		sock->error = GET_ERROR;
-		Signal_Device(sock, EVT_ERROR);
+		OS_Signal_Device(sock, EVT_ERROR);
 		return DR_ERROR;
 	}
 
@@ -619,7 +618,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 		result = GET_ERROR;
 		if (result == NE_WOULDBLOCK) return DR_PEND;
 		sock->error = result;
-		Signal_Device(sock, EVT_ERROR);
+		OS_Signal_Device(sock, EVT_ERROR);
 		return DR_ERROR;
 	}
 
@@ -644,7 +643,7 @@ static REBOOL Nonblocking_Mode(SOCKET sock)
 	Nonblocking_Mode(news->socket);
 
 	Attach_Request((REBREQ**)&sock->data, news);
-	Signal_Device(sock, EVT_ACCEPT);
+	OS_Signal_Device(sock, EVT_ACCEPT);
 
 	// Even though we signalled, we keep the listen pending to
 	// accept additional connections.
diff --git a/src/os/host-device.c b/src/os/host-device.c
@@ -248,7 +248,7 @@ static int Poll_Default(REBDEV *dev)
 
 /***********************************************************************
 **
-*/	void Signal_Device(REBREQ *req, REBINT type)
+*/	void OS_Signal_Device(REBREQ *req, REBINT type)
 /*
 **		Generate a device event to awake a port on REBOL.
 **
@@ -351,7 +351,7 @@ static int Poll_Default(REBDEV *dev)
 	else if (dev->pending) {
 		Detach_Request(&dev->pending, req); // often a no-op
 		if (result == DR_ERROR && GET_FLAG(req->flags, RRF_ALLOC)) { // not on stack
-			Signal_Device(req, EVT_ERROR);
+			OS_Signal_Device(req, EVT_ERROR);
 		}
 	}
 	else if (result < 0) {
diff --git a/src/os/posix/dev-serial.c b/src/os/posix/dev-serial.c
@@ -277,13 +277,13 @@ static REBINT Set_Serial_Settings(int ttyfd, REBREQ *req)
 #endif
 	if (result < 0) {
 		req->error = -RFE_BAD_READ;
-		Signal_Device(req, EVT_ERROR);
+		OS_Signal_Device(req, EVT_ERROR);
 		return DR_ERROR;
 	} else if (result == 0) {
 		return DR_PEND;
 	} else {
 		req->actual = result;
-		Signal_Device(req, EVT_READ);
+		OS_Signal_Device(req, EVT_READ);
 	}
 
 	return DR_DONE;
@@ -314,13 +314,13 @@ static REBINT Set_Serial_Settings(int ttyfd, REBREQ *req)
 			return DR_PEND;
 		}
 		req->error = -RFE_BAD_WRITE;
-		Signal_Device(req, EVT_ERROR);
+		OS_Signal_Device(req, EVT_ERROR);
 		return DR_ERROR;
 	}
 	req->actual += result;
 	req->data += result;
 	if (req->actual >= req->length) {
-		Signal_Device(req, EVT_WROTE);
+		OS_Signal_Device(req, EVT_WROTE);
 		return DR_DONE;
 	} else {
 		SET_FLAG(req->flags, RRF_ACTIVE); /* notify OS_WAIT of activity */
diff --git a/src/os/win32/dev-serial.c b/src/os/win32/dev-serial.c
@@ -191,15 +191,15 @@ static REBINT Set_Serial_Settings(HANDLE h, REBREQ *req)
 	//RL_Print("reading %d bytes\n", req->length);
 	if (!ReadFile(req->handle, req->data, req->length, &result, 0) || result < 0) {
 		req->error = -RFE_BAD_READ;
-		Signal_Device(req, EVT_ERROR);
+		OS_Signal_Device(req, EVT_ERROR);
 		return DR_ERROR;
 	} else {
 		if (result == 0) {
 			return DR_PEND;
 		} else if (result > 0){
 			//RL_Print("read %d bytes\n", req->actual);
 			req->actual = result;
-			Signal_Device(req, EVT_READ);
+			OS_Signal_Device(req, EVT_READ);
 		}
 	}
 
@@ -237,13 +237,13 @@ static REBINT Set_Serial_Settings(HANDLE h, REBREQ *req)
 
 	if (result < 0) {
 		req->error = -RFE_BAD_WRITE;
-		Signal_Device(req, EVT_ERROR);
+		OS_Signal_Device(req, EVT_ERROR);
 		return DR_ERROR;
 	}
 	req->actual += result;
 	//req->data += result;
 	if (req->actual >= req->length) {
-		Signal_Device(req, EVT_WROTE);
+		OS_Signal_Device(req, EVT_WROTE);
 		return DR_DONE;
 	} else {
 		SET_FLAG(req->flags, RRF_ACTIVE); /* notify OS_WAIT of activity */
