CVS commit: src/usr.sbin/altq

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Fri Oct  4 15:37:01 UTC 2024

Modified Files:
        src/usr.sbin/altq/altqstat: quip_client.c
        src/usr.sbin/altq/libaltq: quip_server.c

Log Message:
altq: fix lint warnings about "effectively discards 'const'"

No binary change.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/altq/altqstat/quip_client.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/altq/libaltq/quip_server.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.sbin/altq/altqstat/quip_client.c
diff -u src/usr.sbin/altq/altqstat/quip_client.c:1.15 src/usr.sbin/altq/altqstat/quip_client.c:1.16
--- src/usr.sbin/altq/altqstat/quip_client.c:1.15	Sun May  7 11:41:49 2023
+++ src/usr.sbin/altq/altqstat/quip_client.c	Fri Oct  4 15:37:00 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: quip_client.c,v 1.15 2023/05/07 11:41:49 andvar Exp $	*/
+/*	$NetBSD: quip_client.c,v 1.16 2024/10/04 15:37:00 rillig Exp $	*/
 /*	$KAME: quip_client.c,v 1.9 2003/05/17 05:59:00 itojun Exp $	*/
 /*
  * Copyright (C) 1999-2000
@@ -144,7 +144,8 @@ quip_closeserver(void)
 void
 quip_sendrequest(FILE *fp, const char *request)
 {
-	char buf[QUIPMSG_MAXSIZE], *cp;
+	char buf[QUIPMSG_MAXSIZE];
+	const char *cp;
 	int n;
 
 	if ((cp = strstr(request, "QUIP")) == NULL) {
@@ -445,7 +446,7 @@ quip_printfilter(const char *ifname, con
 static char *
 extract_ifname(const char *name)
 {
-	char *cp;
+	const char *cp;
 	int len;
 	static char ifname[64];
 

Index: src/usr.sbin/altq/libaltq/quip_server.c
diff -u src/usr.sbin/altq/libaltq/quip_server.c:1.6 src/usr.sbin/altq/libaltq/quip_server.c:1.7
--- src/usr.sbin/altq/libaltq/quip_server.c:1.6	Sat Oct 19 17:16:37 2013
+++ src/usr.sbin/altq/libaltq/quip_server.c	Fri Oct  4 15:37:00 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: quip_server.c,v 1.6 2013/10/19 17:16:37 christos Exp $	*/
+/*	$NetBSD: quip_server.c,v 1.7 2024/10/04 15:37:00 rillig Exp $	*/
 /*	$KAME: quip_server.c,v 1.6 2001/08/20 06:41:32 kjc Exp $	*/
 /*
  * Copyright (C) 1999-2000
@@ -431,6 +431,7 @@ string_match(const char *s1, const char 
 static int
 query_list(const char *cmd, const char *arg, char *msg, size_t maxmsg)
 {
+	const char *colon;
 	char tmp[256], *cp, *ep;
 	struct ifinfo *ifinfo;
 	struct classinfo *clinfo;
@@ -442,9 +443,9 @@ query_list(const char *cmd, const char *
 		print_if = print_class = print_fltr = 1;
 	} else {
 		print_if = print_class = print_fltr = 0;
-		if ((cp = strchr(arg, ':')) == NULL)
+		if ((colon = strchr(arg, ':')) == NULL)
 			print_if = 1;
-		else if (strchr(cp+1, ':') == NULL)
+		else if (strchr(colon+1, ':') == NULL)
 			print_class = 1;
 		else
 			print_fltr = 1;