Module Name: src
Committed By: christos
Date: Mon Jun 21 03:14:41 UTC 2021
Modified Files:
src/sbin/ifconfig: agr.c env.c lagg.c pfsync.c vlan.c
Log Message:
fix proplib deprecation
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sbin/ifconfig/agr.c src/sbin/ifconfig/vlan.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/ifconfig/env.c
cvs rdiff -u -r1.1 -r1.2 src/sbin/ifconfig/lagg.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/ifconfig/pfsync.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/agr.c
diff -u src/sbin/ifconfig/agr.c:1.15 src/sbin/ifconfig/agr.c:1.16
--- src/sbin/ifconfig/agr.c:1.15 Tue Jul 15 17:27:58 2008
+++ src/sbin/ifconfig/agr.c Sun Jun 20 23:14:40 2021
@@ -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 @@ agrsetport(prop_dictionary_t env, prop_d
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;
Index: src/sbin/ifconfig/vlan.c
diff -u src/sbin/ifconfig/vlan.c:1.15 src/sbin/ifconfig/vlan.c:1.16
--- src/sbin/ifconfig/vlan.c:1.15 Fri Aug 16 06:33:17 2019
+++ src/sbin/ifconfig/vlan.c Sun Jun 20 23:14:40 2021
@@ -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 @@ setvlanif(prop_dictionary_t env, prop_di
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;
}
Index: src/sbin/ifconfig/env.c
diff -u src/sbin/ifconfig/env.c:1.13 src/sbin/ifconfig/env.c:1.14
--- src/sbin/ifconfig/env.c:1.13 Sun Jun 7 02:02:58 2020
+++ src/sbin/ifconfig/env.c Sun Jun 20 23:14:40 2021
@@ -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 @@ getifname(prop_dictionary_t env)
{
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
Index: src/sbin/ifconfig/lagg.c
diff -u src/sbin/ifconfig/lagg.c:1.1 src/sbin/ifconfig/lagg.c:1.2
--- src/sbin/ifconfig/lagg.c:1.1 Mon May 17 00:07:42 2021
+++ src/sbin/ifconfig/lagg.c Sun Jun 20 23:14:40 2021
@@ -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 @@ setlaggport(prop_dictionary_t env, prop_
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;
Index: src/sbin/ifconfig/pfsync.c
diff -u src/sbin/ifconfig/pfsync.c:1.3 src/sbin/ifconfig/pfsync.c:1.4
--- src/sbin/ifconfig/pfsync.c:1.3 Sun Jun 7 02:02:58 2020
+++ src/sbin/ifconfig/pfsync.c Sun Jun 20 23:14:40 2021
@@ -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 @@ setpfsyncdev(prop_dictionary_t env, prop
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;
}
