PERFORCE change 113285 for review

Todd Miller millert at FreeBSD.org
Sun Jan 21 22:40:46 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=113285

Change 113285 by millert at millert_macbook on 2007/01/21 22:35:16

	Remove old debugging printfs.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#6 (text+ko) ====

@@ -914,9 +914,6 @@
 	port = (ipc_port_t) kmsg->ikm_header->msgh_remote_port;
 	assert(IP_VALID(port));
 
-	if ((option & ~(MACH_SEND_TIMEOUT|MACH_SEND_ALWAYS)) != 0)
-		printf("ipc_kmsg_send: bad option 0x%x\n", option);
-
 	ip_lock(port);
 
 	if (port->ip_receiver == ipc_space_kernel) {
@@ -2171,7 +2168,6 @@
 			ipc_port_request_index_t request;
 
 			if (!space->is_active) {
-				printf("ipc_kmsg_copyout_header: dead space\n");
 				is_write_unlock(space);
 				return (MACH_RCV_HEADER_ERROR|
 					MACH_MSG_IPC_SPACE);
@@ -2181,7 +2177,6 @@
 				notify_port = ipc_port_lookup_notify(space,
 								     notify);
 				if (notify_port == IP_NULL) {
-					printf("ipc_kmsg_copyout_header: no notify port\n");
 					is_write_unlock(space);
 					return MACH_RCV_INVALID_NOTIFY;
 				}
@@ -2236,15 +2231,12 @@
 				if (kr != KERN_SUCCESS) {
 					/* space is unlocked */
 
-					if (kr == KERN_RESOURCE_SHORTAGE) {
-						printf("ipc_kmsg_copyout_header: can't grow kernel ipc space\n");
+					if (kr == KERN_RESOURCE_SHORTAGE)
 						return (MACH_RCV_HEADER_ERROR|
 							MACH_MSG_IPC_KERNEL);
-					} else {
-						printf("ipc_kmsg_copyout_header: can't grow user ipc space\n");
+					else
 						return (MACH_RCV_HEADER_ERROR|
 							MACH_MSG_IPC_SPACE);
-					}
 				}
 				/* space is locked again; start over */
 
@@ -2282,11 +2274,9 @@
 
 				kr = ipc_port_dngrow(reply, ITS_SIZE_NONE);
 				/* port is unlocked */
-				if (kr != KERN_SUCCESS) {
-					printf("ipc_kmsg_copyout_header: can't grow kernel ipc space2\n");
+				if (kr != KERN_SUCCESS)
 					return (MACH_RCV_HEADER_ERROR|
 						MACH_MSG_IPC_KERNEL);
-				}
 
 				is_write_lock(space);
 				continue;
@@ -2323,7 +2313,6 @@
 
 		is_read_lock(space);
 		if (!space->is_active) {
-			printf("ipc_kmsg_copyout_header: dead space2\n");
 			is_read_unlock(space);
 			return MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE;
 		}
@@ -2334,13 +2323,11 @@
 			/* must check notify even though it won't be used */
 
 			if ((entry = ipc_entry_lookup(space, notify)) == IE_NULL) {
-				printf("ipc_kmsg_copyout_header: ipc_entry_lookup failed\n");
 				is_read_unlock(space);
 				return MACH_RCV_INVALID_NOTIFY;
 			}
 	
 			if ((entry->ie_bits & MACH_PORT_TYPE_RECEIVE) == 0) {
-				printf("ipc_kmsg_copyout_header: MACH_PORT_TYPE_RECEIVE not set!\n");
 				is_read_unlock(space);
 				return MACH_RCV_INVALID_NOTIFY;
 			}
@@ -2922,10 +2909,8 @@
 	mach_msg_return_t mr;
 
 	mr = ipc_kmsg_copyout_header(kmsg->ikm_header, space, notify);
-	if (mr != MACH_MSG_SUCCESS) {
-		printf("ipc_kmsg_copyout: ipc_kmsg_copyout_header failed: %d\n", mr);
+	if (mr != MACH_MSG_SUCCESS)
 		return mr;
-	}
 
 	if (kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) {
 		mr = ipc_kmsg_copyout_body(kmsg, space, map, slist);


More information about the trustedbsd-cvs mailing list