xnu-4570.71.2.tar.gz

[apple/xnu.git] / osfmk / mach / mig.h

diff --git a/osfmk/mach/mig.h b/osfmk/mach/mig.h
index 31a454a60c407d43dc85cc057a9c4e4fa7bc7833..44a208dd6d920cc2896244e9bbe4b18ff3c8c6c6 100644 (file)
--- a/osfmk/mach/mig.h
+++ b/osfmk/mach/mig.h
@@ -45,31 +45,25 @@
 
 #if defined(MACH_KERNEL)
 
-#if defined(BSMALL_LATER)
-/* Really small configurations don't need type checking */
-#define __MigTypeCheck 0
-#else
+#if !defined(__MigTypeCheck)
 /* Turn MIG type checking on by default for kernel */
 #define __MigTypeCheck 1
 #endif
+
 #define __MigKernelSpecificCode 1
 #define _MIG_KERNEL_SPECIFIC_CODE_ 1
 
-/* Otherwise check legacy setting (temporary) */
-#elif defined(TypeCheck)  
-
-#define __MigTypeCheck TypeCheck
-
 #elif !defined(__MigTypeCheck)
 
-/* otherwise, default MIG type checking on - except in small configurations */
-#if defined(BSMALL)
-#define __MigTypeCheck 0
+#if defined(TypeCheck)
+/* use legacy setting (temporary) */
+#define __MigTypeCheck TypeCheck
 #else
+/* default MIG type checking on */
 #define __MigTypeCheck 1
 #endif
 
-#endif /* !defined(__MigTypeCheck) */
+#endif /* !defined(MACH_KERNEL) && !defined(__MigTypeCheck) */
 
 /*
  * Pack MIG message structs.
@@ -279,11 +273,12 @@ extern void mig_put_reply_port(mach_port_t reply_port);
 
 /* Bounded string copy */
 extern int mig_strncpy(char    *dest, const char *src, int     len);
+extern int mig_strncpy_zerofill(char   *dest, const char *src, int     len);
 
 #ifdef KERNEL_PRIVATE
 
 /* Allocate memory for out-of-stack mig structures */
-extern char *mig_user_allocate(vm_size_t size);
+extern void *mig_user_allocate(vm_size_t size);
 
 /* Deallocate memory used for out-of-stack mig structures */
 extern void mig_user_deallocate(char *data, vm_size_t size);