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.)
This commit is contained in:
jakllsch 2019-02-27 16:30:40 +00:00
parent 600c236c7b
commit 215056ede3
5 changed files with 15 additions and 15 deletions

View File

@ -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 <jmcneill@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 char *clkname, const char *prop)
clk = fdtbus_clock_get_index(phandle, index);
break;
}
resid -= strlen(p);
resid -= strlen(p) + 1;
p += strlen(p) + 1;
}

View File

@ -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 <jmcneill@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 *name, void (*cb)(void *), void *cbarg)
dma = fdtbus_dma_get_index(phandle, index, cb, cbarg);
break;
}
resid -= strlen(p);
resid -= strlen(p) + 1;
p += strlen(p) + 1;
}

View File

@ -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 <jmcneill@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 *phyname)
phy = fdtbus_phy_get_index(phandle, index);
break;
}
resid -= strlen(p);
resid -= strlen(p) + 1;
p += strlen(p) + 1;
}

View File

@ -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 <jmcneill@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 *rstname)
rst = fdtbus_reset_get_index(phandle, index);
break;
}
resid -= strlen(p);
resid -= strlen(p) + 1;
p += strlen(p) + 1;
}

View File

@ -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 <jmcneill@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 char *name, bus_addr_t *paddr,
error = fdtbus_get_reg(phandle, index, paddr, psize);
break;
}
resid -= strlen(p);
resid -= strlen(p) + 1;
p += strlen(p) + 1;
}