- In the KTR_EXTEND case, use a const char * to point to the passed in

  filename insteada of copying the first 32 characters of it.
- Add in const modifiers for the passed in format strings and filenames
  and their respective members in the ktr_entry struct.

1 files changed, 6 insertions, 9 deletions

diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index bf3ce52..050b303 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -96,15 +96,12 @@ struct ktr_entry {
 #ifndef KTRDESCSIZE
 #define KTRDESCSIZE 80
 #endif
-#ifndef KTRFILENAMESIZE
-#define KTRFILENAMESIZE 32
-#endif
-	char	ktr_desc [KTRDESCSIZE];
-	char    ktr_filename [KTRFILENAMESIZE];
+	char	ktr_desc[KTRDESCSIZE];
+	const	char *ktr_filename;
 	int	ktr_line;
 	int	ktr_cpu;
 #else
-	char	*ktr_desc;
+	const	char *ktr_desc;
 	u_long	ktr_parm1;
 	u_long	ktr_parm2;
 	u_long	ktr_parm3;
@@ -132,10 +129,10 @@ extern struct ktr_entry ktr_buf[];
 #endif
 
 #ifdef KTR_EXTEND
-void	ktr_tracepoint(u_int mask, char *filename, u_int line,
-		       char *format, ...) __printflike(4, 5);
+void	ktr_tracepoint(u_int mask, const char *filename, u_int line,
+		       const char *format, ...) __printflike(4, 5);
 #else
-void	ktr_tracepoint(u_int mask, char *format, u_long arg1, u_long arg2,
+void	ktr_tracepoint(u_int mask, const char *format, u_long arg1, u_long arg2,
 		       u_long arg3, u_long arg4, u_long arg5);
 #endif