xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / bsd / kern / kern_asl.c

diff --git a/bsd/kern/kern_asl.c b/bsd/kern/kern_asl.c
index a005c1055cdd9b459567350ad0b1c1f4ba739ab8..c9e1cdfeaef638eb4ae32c7704745ab068434b47 100644 (file)
--- a/bsd/kern/kern_asl.c
+++ b/bsd/kern/kern_asl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Apple Inc. All rights reserved.
+ * Copyright (c) 2020 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -78,13 +78,12 @@
  *               to truncate the output.
  */
 static int
-kern_asl_msg_va(int level, const char *facility, int num_pairs, va_list vargs)
+kern_asl_msg_va(int level, const char *facility, size_t num_pairs, va_list vargs)
 {
        int err = 0;
        char fmt[MAX_FMT_LEN];  /* Format string to use with vaddlog */
-       int calc_pairs = 0;
+       size_t calc_pairs = 0;
        size_t len;
-       int i;
 
        /* Mask extra bits, if any, from priority level */
        level = LOG_PRI(level);
@@ -120,7 +119,7 @@ kern_asl_msg_va(int level, const char *facility, int num_pairs, va_list vargs)
 
        /* Append format strings [%s %s] for the key-value pairs in vargs */
        len = MAX_FMT_LEN - KASL_NEWLINE_CHAR_LEN;
-       for (i = 0; i < calc_pairs; i++) {
+       for (size_t i = 0; i < calc_pairs; i++) {
                (void) strlcat(fmt, KASL_KEYVAL_FMT, len);
        }
 
@@ -141,7 +140,7 @@ kern_asl_msg_va(int level, const char *facility, int num_pairs, va_list vargs)
 }
 
 int
-kern_asl_msg(int level, const char *facility, int num_pairs, ...)
+kern_asl_msg(int level, const char *facility, size_t num_pairs, ...)
 {
        int err;
        va_list ap;
@@ -164,9 +163,9 @@ kern_asl_msg(int level, const char *facility, int num_pairs, ...)
  *     buflen - size of buffer that contains the string
  */
 int
-escape_str(char *str, int len, int buflen)
+escape_str(char *str, size_t len, size_t buflen)
 {
-       int count;
+       size_t count;
        char *src, *dst;
 
        /* Count number of characters to escape */