CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Tue Oct  5 22:22:46 UTC 2021

Modified Files:
        src/usr.bin/indent: lexi.c

Log Message:
indent: use buffer type in debug_print_buf

That function had been created before 'struct buffer' was invented,
therefore it used two pointers as parameters. Remove this redundancy.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/indent/lexi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.71 src/usr.bin/indent/lexi.c:1.72
--- src/usr.bin/indent/lexi.c:1.71	Tue Oct  5 22:09:05 2021
+++ src/usr.bin/indent/lexi.c	Tue Oct  5 22:22:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lexi.c,v 1.71 2021/10/05 22:09:05 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.72 2021/10/05 22:22:46 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)lexi.c	8.1 (
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.71 2021/10/05 22:09:05 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.72 2021/10/05 22:22:46 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
@@ -239,11 +239,11 @@ token_type_name(token_type ttype)
 }
 
 static void
-print_buf(const char *name, const char *s, const char *e)
+debug_print_buf(const char *name, const struct buffer *buf)
 {
-    if (s < e) {
+    if (buf->s < buf->e) {
 	debug_printf(" %s ", name);
-	debug_vis_range("\"", s, e, "\"");
+	debug_vis_range("\"", buf->s, buf->e, "\"");
     }
 }
 
@@ -252,10 +252,10 @@ lexi_end(token_type ttype)
 {
     debug_printf("in line %d, lexi returns '%s'",
 	line_no, token_type_name(ttype));
-    print_buf("token", token.s, token.e);
-    print_buf("label", lab.s, lab.e);
-    print_buf("code", code.s, code.e);
-    print_buf("comment", com.s, com.e);
+    debug_print_buf("token", &token);
+    debug_print_buf("label", &lab);
+    debug_print_buf("code", &code);
+    debug_print_buf("comment", &com);
     debug_printf("\n");
 
     return ttype;