Module Name: src
Committed By: jakllsch
Date: Wed Feb 27 16:30:41 UTC 2019
Modified Files:
src/sys/dev/fdt: fdt_clock.c fdt_dma.c fdt_phy.c fdt_reset.c fdt_subr.c
Log Message:
Adjust residual calculation in "find index by name" idioms to take into
account the trailing NUL on each name. Some other similar instances of
this idiom already account for this.
(In preparation to factor out this idiom into its own function.)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/fdt/fdt_clock.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/fdt_dma.c \
src/sys/dev/fdt/fdt_reset.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/fdt_phy.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/fdt/fdt_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/fdt_clock.c
diff -u src/sys/dev/fdt/fdt_clock.c:1.6 src/sys/dev/fdt/fdt_clock.c:1.7
--- src/sys/dev/fdt/fdt_clock.c:1.6 Sun Sep 9 07:21:18 2018
+++ src/sys/dev/fdt/fdt_clock.c Wed Feb 27 16:30:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_clock.c,v 1.6 2018/09/09 07:21:18 aymeric Exp $ */
+/* $NetBSD: fdt_clock.c,v 1.7 2019/02/27 16:30:40 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_clock.c,v 1.6 2018/09/09 07:21:18 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_clock.c,v 1.7 2019/02/27 16:30:40 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -137,7 +137,7 @@ fdtbus_clock_get_prop(int phandle, const
clk = fdtbus_clock_get_index(phandle, index);
break;
}
- resid -= strlen(p);
+ resid -= strlen(p) + 1;
p += strlen(p) + 1;
}
Index: src/sys/dev/fdt/fdt_dma.c
diff -u src/sys/dev/fdt/fdt_dma.c:1.2 src/sys/dev/fdt/fdt_dma.c:1.3
--- src/sys/dev/fdt/fdt_dma.c:1.2 Sat Jun 30 20:34:43 2018
+++ src/sys/dev/fdt/fdt_dma.c Wed Feb 27 16:30:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_dma.c,v 1.2 2018/06/30 20:34:43 jmcneill Exp $ */
+/* $NetBSD: fdt_dma.c,v 1.3 2019/02/27 16:30:40 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_dma.c,v 1.2 2018/06/30 20:34:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_dma.c,v 1.3 2019/02/27 16:30:40 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -154,7 +154,7 @@ fdtbus_dma_get(int phandle, const char *
dma = fdtbus_dma_get_index(phandle, index, cb, cbarg);
break;
}
- resid -= strlen(p);
+ resid -= strlen(p) + 1;
p += strlen(p) + 1;
}
Index: src/sys/dev/fdt/fdt_reset.c
diff -u src/sys/dev/fdt/fdt_reset.c:1.2 src/sys/dev/fdt/fdt_reset.c:1.3
--- src/sys/dev/fdt/fdt_reset.c:1.2 Sat Jun 30 20:34:43 2018
+++ src/sys/dev/fdt/fdt_reset.c Wed Feb 27 16:30:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_reset.c,v 1.2 2018/06/30 20:34:43 jmcneill Exp $ */
+/* $NetBSD: fdt_reset.c,v 1.3 2019/02/27 16:30:40 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_reset.c,v 1.2 2018/06/30 20:34:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_reset.c,v 1.3 2019/02/27 16:30:40 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -153,7 +153,7 @@ fdtbus_reset_get(int phandle, const char
rst = fdtbus_reset_get_index(phandle, index);
break;
}
- resid -= strlen(p);
+ resid -= strlen(p) + 1;
p += strlen(p) + 1;
}
Index: src/sys/dev/fdt/fdt_phy.c
diff -u src/sys/dev/fdt/fdt_phy.c:1.3 src/sys/dev/fdt/fdt_phy.c:1.4
--- src/sys/dev/fdt/fdt_phy.c:1.3 Wed Jan 30 01:24:00 2019
+++ src/sys/dev/fdt/fdt_phy.c Wed Feb 27 16:30:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_phy.c,v 1.3 2019/01/30 01:24:00 jmcneill Exp $ */
+/* $NetBSD: fdt_phy.c,v 1.4 2019/02/27 16:30:40 jakllsch Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_phy.c,v 1.3 2019/01/30 01:24:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_phy.c,v 1.4 2019/02/27 16:30:40 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -153,7 +153,7 @@ fdtbus_phy_get(int phandle, const char *
phy = fdtbus_phy_get_index(phandle, index);
break;
}
- resid -= strlen(p);
+ resid -= strlen(p) + 1;
p += strlen(p) + 1;
}
Index: src/sys/dev/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.27 src/sys/dev/fdt/fdt_subr.c:1.28
--- src/sys/dev/fdt/fdt_subr.c:1.27 Wed Jan 30 00:56:47 2019
+++ src/sys/dev/fdt/fdt_subr.c Wed Feb 27 16:30:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.27 2019/01/30 00:56:47 jmcneill Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.28 2019/02/27 16:30:40 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.27 2019/01/30 00:56:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.28 2019/02/27 16:30:40 jakllsch Exp $");
#include "opt_fdt.h"
@@ -230,7 +230,7 @@ fdtbus_get_reg_byname(int phandle, const
error = fdtbus_get_reg(phandle, index, paddr, psize);
break;
}
- resid -= strlen(p);
+ resid -= strlen(p) + 1;
p += strlen(p) + 1;
}
