Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src fix proplib deprecation
details: https://anonhg.NetBSD.org/src/rev/7494f1607589
branches: trunk
changeset: 1021856:7494f1607589
user: christos <christos%NetBSD.org@localhost>
date: Mon Jun 21 03:14:40 2021 +0000
description:
fix proplib deprecation
diffstat:
sbin/ifconfig/agr.c | 6 +++---
sbin/ifconfig/env.c | 6 +++---
sbin/ifconfig/lagg.c | 6 +++---
sbin/ifconfig/pfsync.c | 6 +++---
sbin/ifconfig/vlan.c | 6 +++---
sys/arch/arm/nvidia/tegra_cec.c | 6 +++---
sys/arch/arm/omap/omap3_ehci.c | 6 +++---
sys/dev/dm/dm_ioctl.c | 8 ++++----
sys/dev/pci/machfb.c | 6 +++---
sys/dev/pci/radeonfb.c | 6 +++---
sys/dev/sdmmc/if_bwfm_sdio.c | 6 +++---
11 files changed, 34 insertions(+), 34 deletions(-)
diffs (299 lines):
diff -r 8179bed8176f -r 7494f1607589 sbin/ifconfig/agr.c
--- a/sbin/ifconfig/agr.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sbin/ifconfig/agr.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: agr.c,v 1.15 2008/07/15 21:27:58 dyoung Exp $ */
+/* $NetBSD: agr.c,v 1.16 2021/06/21 03:14:40 christos Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: agr.c,v 1.15 2008/07/15 21:27:58 dyoung Exp $");
+__RCSID("$NetBSD: agr.c,v 1.16 2021/06/21 03:14:40 christos Exp $");
#endif /* !defined(lint) */
#include <sys/param.h>
@@ -101,7 +101,7 @@
return -1;
}
- if (!prop_dictionary_get_cstring_nocopy(env, "agrport", &port)) {
+ if (!prop_dictionary_get_string(env, "agrport", &port)) {
warnx("%s.%d", __func__, __LINE__);
errno = ENOENT;
return -1;
diff -r 8179bed8176f -r 7494f1607589 sbin/ifconfig/env.c
--- a/sbin/ifconfig/env.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sbin/ifconfig/env.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: env.c,v 1.13 2020/06/07 06:02:58 thorpej Exp $ */
+/* $NetBSD: env.c,v 1.14 2021/06/21 03:14:40 christos Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: env.c,v 1.13 2020/06/07 06:02:58 thorpej Exp $");
+__RCSID("$NetBSD: env.c,v 1.14 2021/06/21 03:14:40 christos Exp $");
#endif /* not lint */
#include <errno.h>
@@ -122,7 +122,7 @@
{
const char *s;
- return prop_dictionary_get_cstring_nocopy(env, "if", &s) ? s : NULL;
+ return prop_dictionary_get_string(env, "if", &s) ? s : NULL;
}
ssize_t
diff -r 8179bed8176f -r 7494f1607589 sbin/ifconfig/lagg.c
--- a/sbin/ifconfig/lagg.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sbin/ifconfig/lagg.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lagg.c,v 1.1 2021/05/17 04:07:42 yamaguchi Exp $ */
+/* $NetBSD: lagg.c,v 1.2 2021/06/21 03:14:40 christos Exp $ */
/*
* Copyright (c) 2021 Internet Initiative Japan Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: lagg.c,v 1.1 2021/05/17 04:07:42 yamaguchi Exp $");
+__RCSID("$NetBSD: lagg.c,v 1.2 2021/06/21 03:14:40 christos Exp $");
#endif /* !defined(lint) */
#include <sys/param.h>
@@ -391,7 +391,7 @@
enum lagg_ioctl ioc;
int64_t lpcmd, pri;
- if (!prop_dictionary_get_cstring_nocopy(env, "laggport", &ifname)) {
+ if (!prop_dictionary_get_string(env, "laggport", &ifname)) {
if (lagg_debug)
warnx("%s.%d", __func__, __LINE__);
errno = ENOENT;
diff -r 8179bed8176f -r 7494f1607589 sbin/ifconfig/pfsync.c
--- a/sbin/ifconfig/pfsync.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sbin/ifconfig/pfsync.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pfsync.c,v 1.3 2020/06/07 06:02:58 thorpej Exp $ */
+/* $NetBSD: pfsync.c,v 1.4 2021/06/21 03:14:40 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: pfsync.c,v 1.3 2020/06/07 06:02:58 thorpej Exp $");
+__RCSID("$NetBSD: pfsync.c,v 1.4 2021/06/21 03:14:40 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -155,7 +155,7 @@
struct pfsyncreq pfsyncr;
const char *dev;
- if (!prop_dictionary_get_cstring_nocopy(env, "syncdev", &dev)) {
+ if (!prop_dictionary_get_string(env, "syncdev", &dev)) {
errno = ENOENT;
return -1;
}
diff -r 8179bed8176f -r 7494f1607589 sbin/ifconfig/vlan.c
--- a/sbin/ifconfig/vlan.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sbin/ifconfig/vlan.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vlan.c,v 1.15 2019/08/16 10:33:17 msaitoh Exp $ */
+/* $NetBSD: vlan.c,v 1.16 2021/06/21 03:14:40 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: vlan.c,v 1.15 2019/08/16 10:33:17 msaitoh Exp $");
+__RCSID("$NetBSD: vlan.c,v 1.16 2021/06/21 03:14:40 christos Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -140,7 +140,7 @@
if (getvlan(env, &vlr, false) == -1)
err(EXIT_FAILURE, "%s: getsock", __func__);
- if (!prop_dictionary_get_cstring_nocopy(env, "vlanif", &parent)) {
+ if (!prop_dictionary_get_string(env, "vlanif", &parent)) {
errno = ENOENT;
return -1;
}
diff -r 8179bed8176f -r 7494f1607589 sys/arch/arm/nvidia/tegra_cec.c
--- a/sys/arch/arm/nvidia/tegra_cec.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_cec.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_cec.c,v 1.9 2021/04/24 23:36:27 thorpej Exp $ */
+/* $NetBSD: tegra_cec.c,v 1.10 2021/06/21 03:15:22 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_cec.c,v 1.9 2021/04/24 23:36:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_cec.c,v 1.10 2021/06/21 03:15:22 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -179,7 +179,7 @@
}
aprint_normal_dev(self, "interrupting on %s\n", intrstr);
- prop_dictionary_get_cstring_nocopy(prop, "hdmi-device",
+ prop_dictionary_get_string(prop, "hdmi-device",
&sc->sc_hdmidevname);
fdtbus_reset_assert(sc->sc_rst);
diff -r 8179bed8176f -r 7494f1607589 sys/arch/arm/omap/omap3_ehci.c
--- a/sys/arch/arm/omap/omap3_ehci.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sys/arch/arm/omap/omap3_ehci.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_ehci.c,v 1.14 2021/04/24 23:36:28 thorpej Exp $ */
+/* $NetBSD: omap3_ehci.c,v 1.15 2021/06/21 03:18:40 christos Exp $ */
/*-
* Copyright (c) 2010-2012 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.14 2021/04/24 23:36:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.15 2021/06/21 03:18:40 christos Exp $");
#include "locators.h"
@@ -365,7 +365,7 @@
const char *s = NULL;
enum omap3_ehci_port_mode mode = OMAP3_EHCI_PORT_MODE_NONE;
- if (prop_dictionary_get_cstring_nocopy(prop, key, &s) && s != NULL) {
+ if (prop_dictionary_get_string(prop, key, &s) && s != NULL) {
if (strcmp(s, "phy") == 0) {
mode = OMAP3_EHCI_PORT_MODE_PHY;
#ifdef OMAP_3XXX
diff -r 8179bed8176f -r 7494f1607589 sys/dev/dm/dm_ioctl.c
--- a/sys/dev/dm/dm_ioctl.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sys/dev/dm/dm_ioctl.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.51 2021/05/07 09:53:39 hannken Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.52 2021/06/21 03:16:43 christos Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.51 2021/05/07 09:53:39 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.52 2021/06/21 03:16:43 christos Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -910,8 +910,8 @@
name = NULL;
flags = 0;
- prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name);
- prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid);
+ prop_dictionary_get_string(dm_dict, DM_IOCTL_NAME, &name);
+ prop_dictionary_get_string(dm_dict, DM_IOCTL_UUID, &uuid);
prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags);
prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor);
diff -r 8179bed8176f -r 7494f1607589 sys/dev/pci/machfb.c
--- a/sys/dev/pci/machfb.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sys/dev/pci/machfb.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.104 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: machfb.c,v 1.105 2021/06/21 03:19:21 christos Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.104 2021/04/24 23:36:57 thorpej Exp $");
+ "$NetBSD: machfb.c,v 1.105 2021/06/21 03:19:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -520,7 +520,7 @@
default_mode.hdisplay = width;
default_mode.vdisplay = height;
- prop_dictionary_get_cstring_nocopy(device_properties(sc->sc_dev),
+ prop_dictionary_get_string(device_properties(sc->sc_dev),
"videomode", &mptr);
memset(&sc->sc_ei, 0, sizeof(sc->sc_ei));
diff -r 8179bed8176f -r 7494f1607589 sys/dev/pci/radeonfb.c
--- a/sys/dev/pci/radeonfb.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sys/dev/pci/radeonfb.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.114 2021/04/24 23:36:57 thorpej Exp $ */
+/* $NetBSD: radeonfb.c,v 1.115 2021/06/21 03:21:17 christos Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.114 2021/04/24 23:36:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.115 2021/06/21 03:21:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -812,7 +812,7 @@
/* setup default video mode from devprop (allows PROM override) */
sc->sc_defaultmode = radeonfb_default_mode;
- if (prop_dictionary_get_cstring_nocopy(device_properties(sc->sc_dev),
+ if (prop_dictionary_get_string(device_properties(sc->sc_dev),
"videomode", &mptr)) {
strncpy(sc->sc_modebuf, mptr, sizeof(sc->sc_modebuf));
diff -r 8179bed8176f -r 7494f1607589 sys/dev/sdmmc/if_bwfm_sdio.c
--- a/sys/dev/sdmmc/if_bwfm_sdio.c Mon Jun 21 03:04:27 2021 +0000
+++ b/sys/dev/sdmmc/if_bwfm_sdio.c Mon Jun 21 03:14:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_sdio.c,v 1.25 2021/01/27 03:10:21 thorpej Exp $ */
+/* $NetBSD: if_bwfm_sdio.c,v 1.26 2021/06/21 03:17:59 christos Exp $ */
/* $OpenBSD: if_bwfm_sdio.c,v 1.1 2017/10/11 17:19:50 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -565,7 +565,7 @@
/* locate in FDT */
dict = device_properties(self);
- if (prop_dictionary_get_cstring_nocopy(dict, "fdt-path", &str)) {
+ if (prop_dictionary_get_string(dict, "fdt-path", &str)) {
/* search in FDT */
phandle = OF_finddevice(str);
} else {
@@ -576,7 +576,7 @@
return -1;
/* locate in FDT */
dict = device_properties(dev);
- if (!prop_dictionary_get_cstring_nocopy(dict, "fdt-path", &str))
+ if (!prop_dictionary_get_string(dict, "fdt-path", &str))
return -1;
/* are we the only FDT child ? */
Home |
Main Index |
Thread Index |
Old Index