svn commit: r335612 - head/sbin/dhclient
Author: eadler
Date: Mon Jun 25 01:29:54 2018
New Revision: 335612
URL: https://svnweb.freebsd.org/changeset/base/335612
Log:
dhclient: recorrect __progname to getprogname()
A more correct way to modernize code that uses __progname is to just
replace each occurance of it with a call to getprogname(3)
Reported by: ian
Reviewed by: imp
Modified:
head/sbin/dhclient/dhclient.c
Modified: head/sbin/dhclient/dhclient.c
==
--- head/sbin/dhclient/dhclient.c Sun Jun 24 23:19:31 2018
(r335611)
+++ head/sbin/dhclient/dhclient.c Mon Jun 25 01:29:54 2018
(r335612)
@@ -149,7 +149,6 @@ int fork_privchld(int, int);
#define MIN_MTU 68
static time_t scripttime;
-static char*__progname;
int
findproto(char *cp, int n)
@@ -379,12 +378,10 @@ main(int argc, char *argv[])
pid_totherpid;
cap_rights_t rights;
- __progname = basename(argv[0]);
-
init_casper();
/* Initially, log errors to stderr as well as to syslogd. */
- cap_openlog(capsyslog, __progname, LOG_PID | LOG_NDELAY,
DHCPD_LOG_FACILITY);
+ cap_openlog(capsyslog, getprogname(), LOG_PID | LOG_NDELAY,
DHCPD_LOG_FACILITY);
cap_setlogmask(capsyslog, LOG_UPTO(LOG_DEBUG));
while ((ch = getopt(argc, argv, "bc:dl:p:qu")) != -1)
@@ -566,7 +563,7 @@ void
usage(void)
{
- fprintf(stderr, "usage: %s [-bdqu] ", __progname);
+ fprintf(stderr, "usage: %s [-bdqu] ", getprogname());
fprintf(stderr, "[-c conffile] [-l leasefile] interface\n");
exit(1);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r335602 - head/sbin/dhclient
On 24 June 2018 at 07:35, Ian Lepore wrote:
> On Sun, 2018-06-24 at 13:23 +, Eitan Adler wrote:
>> Author: eadler
>> Date: Sun Jun 24 13:23:27 2018
>> New Revision: 335602
>> URL: https://svnweb.freebsd.org/changeset/base/335602
>>
>> Log:
>> dhclient: build with WARNS=6
>>
>> - add static in a number of places
>> - initialize __progname rather than rely on magical extern values
>> - use nitems() instead of manually spelling it out
>> - unshadow 'idi'
>> - teach 'error' that it is '__dead2'
>> - add missing 'break'
>
> The changes related to __progname aren't correct. __progname is a bsd-
> ism that goes back to at least 4.4BSD,
Thanks!
Is this correct then?
Index: dhclient.c
===
--- dhclient.c (revision 335611)
+++ dhclient.c (working copy)
@@ -149,7 +149,6 @@ int fork_privchld(int, int);
#define MIN_MTU 68
static time_t scripttime;
-static char *__progname;
int
findproto(char *cp, int n)
@@ -379,12 +378,10 @@ main(int argc, char *argv[])
pid_t otherpid;
cap_rights_t rights;
- __progname = basename(argv[0]);
-
init_casper();
/* Initially, log errors to stderr as well as to syslogd. */
- cap_openlog(capsyslog, __progname, LOG_PID | LOG_NDELAY, DHCPD_LOG_FACILITY);
+ cap_openlog(capsyslog, getprogname(), LOG_PID | LOG_NDELAY,
DHCPD_LOG_FACILITY);
cap_setlogmask(capsyslog, LOG_UPTO(LOG_DEBUG));
while ((ch = getopt(argc, argv, "bc:dl:p:qu")) != -1)
@@ -566,7 +563,7 @@ void
usage(void)
{
- fprintf(stderr, "usage: %s [-bdqu] ", __progname);
+ fprintf(stderr, "usage: %s [-bdqu] ", getprogname());
fprintf(stderr, "[-c conffile] [-l leasefile] interface\n");
exit(1);
}
--
Eitan Adler
Source, Ports, Doc committer
Bugmeister, Ports Security teams
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335611 - head/sys/arm/broadcom/bcm2835
Author: gonzo
Date: Sun Jun 24 23:19:31 2018
New Revision: 335611
URL: https://svnweb.freebsd.org/changeset/base/335611
Log:
[rpi] Fix compatiblity with upstream DTB for RPi 3B and 3B+
Upstream dtb switched to using brcm,bcm2837 for platform
compatibility string. Patch platfrom and cpufreq compatiblity
data accordingly.
Submitted by: Sylvain Garrigues
Tested by:db@
Differential Revision:https://reviews.freebsd.org/D15998
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c Sun Jun 24 21:46:29
2018(r335610)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c Sun Jun 24 23:19:31
2018(r335611)
@@ -127,6 +127,7 @@ static struct ofw_compat_data compat_data[] = {
{ "broadcom,bcm2708-vc",1 },
{ "brcm,bcm2709", 1 },
{ "brcm,bcm2836", 1 },
+ { "brcm,bcm2837", 1 },
{ NULL, 0 }
};
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
==
--- head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sun Jun 24 21:46:29
2018(r335610)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Sun Jun 24 23:19:31
2018(r335611)
@@ -154,4 +154,5 @@ static platform_method_t bcm2836_methods[] = {
};
FDT_PLATFORM_DEF2(bcm2836, bcm2836_legacy, "bcm2836 (legacy)", 0,
"brcm,bcm2709", 100);
FDT_PLATFORM_DEF2(bcm2836, bcm2836, "bcm2836", 0, "brcm,bcm2836", 100);
+FDT_PLATFORM_DEF2(bcm2836, bcm2837, "bcm2837", 0, "brcm,bcm2837", 100);
#endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r333590 - head/share/man/man9
Sorry, I meant to respond. http://concurrencykit.org/presentations/ebr.pdf http://scalebsd.org/blog/2018/05/03/Why-is-munmap-single-threaded-and-what-can-we-do-about-it http://scalebsd.org/blog/2018/06/16/UDP-and-epoch-for-liveness-guarantees On Sun, Jun 24, 2018 at 13:56 Ed Schouten wrote: > Hi Matt, > > 2018-05-17 9:06 GMT+02:00 Ed Schouten : > > Hi Matt, > > > > 2018-05-14 1:16 GMT+02:00 Matt Macy : > >> +Epochs do not have any lock ordering issues. Entering and leaving > > > > It looks like the man page is missing some newlines between sentences. > > > > Quick question: How does this work relate to RCU > > (https://en.wikipedia.org/wiki/Read-copy-update)? If there is any > > relation, should we mention it in the documentation? > > I never got a response to this. Any thoughts? > > -- > Ed Schouten > Nuxi, 's-Hertogenbosch, the Netherlands > ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335610 - head/sys/netinet
Author: sbruno Date: Sun Jun 24 21:46:29 2018 New Revision: 335610 URL: https://svnweb.freebsd.org/changeset/base/335610 Log: Enable TCP_FASTOPEN by default for FreeBSD 12. Submitted by: kbowling Reviewed by: tuexen Differential Revision:https://reviews.freebsd.org/D15959 Modified: head/sys/netinet/tcp_fastopen.c Modified: head/sys/netinet/tcp_fastopen.c == --- head/sys/netinet/tcp_fastopen.c Sun Jun 24 21:36:37 2018 (r335609) +++ head/sys/netinet/tcp_fastopen.c Sun Jun 24 21:46:29 2018 (r335610) @@ -278,7 +278,7 @@ SYSCTL_UINT(_net_inet_tcp_fastopen, OID_AUTO, ccache_b CTLFLAG_VNET | CTLFLAG_RDTUN, _NAME(tcp_fastopen_ccache_buckets), 0, "Client cookie cache number of buckets (power of 2)"); -VNET_DEFINE(unsigned int, tcp_fastopen_client_enable) = 0; +VNET_DEFINE(unsigned int, tcp_fastopen_client_enable) = 1; static int sysctl_net_inet_tcp_fastopen_client_enable(SYSCTL_HANDLER_ARGS); SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, client_enable, CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RW, NULL, 0, ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r333590 - head/share/man/man9
On 24/06/2018 23:55, Ed Schouten wrote: > Hi Matt, > > 2018-05-17 9:06 GMT+02:00 Ed Schouten : >> Hi Matt, >> >> 2018-05-14 1:16 GMT+02:00 Matt Macy : >>> +Epochs do not have any lock ordering issues. Entering and leaving >> >> It looks like the man page is missing some newlines between sentences. >> >> Quick question: How does this work relate to RCU >> (https://en.wikipedia.org/wiki/Read-copy-update)? If there is any >> relation, should we mention it in the documentation? > > I never got a response to this. Any thoughts? Perhaps a little application of google can help. [keywords: epoch based reclamation] -- Andriy Gapon ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335609 - head/sys/netinet
Author: sbruno
Date: Sun Jun 24 21:36:37 2018
New Revision: 335609
URL: https://svnweb.freebsd.org/changeset/base/335609
Log:
Reap unused variable and assignment that had no effect. Noted by cross
compiling with gcc on mips.
Reviewed by: mmacy
Modified:
head/sys/netinet/in_pcb.c
Modified: head/sys/netinet/in_pcb.c
==
--- head/sys/netinet/in_pcb.c Sun Jun 24 21:19:08 2018(r335608)
+++ head/sys/netinet/in_pcb.c Sun Jun 24 21:36:37 2018(r335609)
@@ -1582,11 +1582,9 @@ static void
in_pcbfree_deferred(epoch_context_t ctx)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
int released __unused;
inp = __containerof(ctx, struct inpcb, inp_epoch_ctx);
- pcbinfo = inp->inp_pcbinfo;
INP_WLOCK(inp);
#ifdef INET
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335608 - head/sbin/pfctl
Author: sbruno
Date: Sun Jun 24 21:19:08 2018
New Revision: 335608
URL: https://svnweb.freebsd.org/changeset/base/335608
Log:
Assuming that the intent (from the white space) is that the fprintf()
be executed in the if() conditional. If its not supposed to be printed
inside the conditional, then the braces should be removed and the extra
tabs on the fprintf() should be removed.
Noted by cross compilation with gcc-mips.
Modified:
head/sbin/pfctl/pfctl_altq.c
Modified: head/sbin/pfctl/pfctl_altq.c
==
--- head/sbin/pfctl/pfctl_altq.cSun Jun 24 19:29:29 2018
(r335607)
+++ head/sbin/pfctl/pfctl_altq.cSun Jun 24 21:19:08 2018
(r335608)
@@ -497,12 +497,13 @@ cbq_compute_idletime(struct pfctl *pf, struct pf_altq
* this causes integer overflow in kernel!
* (bandwidth < 6Kbps when max_pkt_size=1500)
*/
- if (pa->bandwidth != 0 && (pf->opts & PF_OPT_QUIET) == 0)
+ if (pa->bandwidth != 0 && (pf->opts & PF_OPT_QUIET) == 0) {
warnx("queue bandwidth must be larger than %s",
rate2str(ifnsPerByte * (double)opts->maxpktsize /
(double)INT_MAX * (double)pa->ifbandwidth));
fprintf(stderr, "cbq: queue %s is too slow!\n",
pa->qname);
+ }
nsPerByte = (double)(INT_MAX / opts->maxpktsize);
}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r333590 - head/share/man/man9
Hi Matt, 2018-05-17 9:06 GMT+02:00 Ed Schouten : > Hi Matt, > > 2018-05-14 1:16 GMT+02:00 Matt Macy : >> +Epochs do not have any lock ordering issues. Entering and leaving > > It looks like the man page is missing some newlines between sentences. > > Quick question: How does this work relate to RCU > (https://en.wikipedia.org/wiki/Read-copy-update)? If there is any > relation, should we mention it in the documentation? I never got a response to this. Any thoughts? -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335607 - head/stand/forth
Author: dteske Date: Sun Jun 24 19:29:29 2018 New Revision: 335607 URL: https://svnweb.freebsd.org/changeset/base/335607 Log: check-password.4th(8): Fix manual [in]accuracy SVN r280384 updated the maximum password length from 16 bytes to 255. The manual was not updated to reflect this. Found while working on kern/207069. MFC after:3 days X-MFC-to: stable/11 stable/10 Sponsored by: Smule, Inc. Modified: head/stand/forth/check-password.4th.8 Modified: head/stand/forth/check-password.4th.8 == --- head/stand/forth/check-password.4th.8 Sun Jun 24 19:01:01 2018 (r335606) +++ head/stand/forth/check-password.4th.8 Sun Jun 24 19:29:29 2018 (r335607) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2011-2015 Devin Teske +.\" Copyright (c) 2011-2018 Devin Teske .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 20, 2015 +.Dd June 24, 2018 .Dt CHECK-PASSWORD.4TH 8 .Os .Sh NAME @@ -91,7 +91,7 @@ for additional information. The environment variables that effect its behavior are: .Bl -tag -width bootlock_password -offset indent .It Va bootlock_password -Sets the bootlock password (up to 16 characters long) that is required by +Sets the bootlock password (up to 255 characters long) that is required by .Ic check-password to be entered before the system is allowed to boot. .It Va geom_eli_passphrase_prompt @@ -100,7 +100,7 @@ kernel for later mounting of .Xr geli 8 encrypted root device(s). .It Va password -Sets the password (up to 16 characters long) that is required by +Sets the password (up to 255 characters long) that is required by .Ic check-password before the user is allowed to visit the boot menu. .El ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335606 - head/sys/dev/bktr
Author: imp
Date: Sun Jun 24 19:01:01 2018
New Revision: 335606
URL: https://svnweb.freebsd.org/changeset/base/335606
Log:
Don't use generic PCI_VENDOR and PCI_PRODUCT macros. Prefix them with
BKTR_ to avoid possible conflicts.
Modified:
head/sys/dev/bktr/bktr_core.c
head/sys/dev/bktr/bktr_os.c
head/sys/dev/bktr/bktr_reg.h
Modified: head/sys/dev/bktr/bktr_core.c
==
--- head/sys/dev/bktr/bktr_core.c Sun Jun 24 18:57:06 2018
(r335605)
+++ head/sys/dev/bktr/bktr_core.c Sun Jun 24 19:01:01 2018
(r335606)
@@ -572,9 +572,9 @@ bktr_store_address(unit, BKTR_MEM_BUF, buf);
/* using the pci device id and revision id */
/* and determine the card type*/
- if (PCI_VENDOR(pci_id) == PCI_VENDOR_BROOKTREE)
+ if (BKTR_PCI_VENDOR(pci_id) == PCI_VENDOR_BROOKTREE)
{
- switch (PCI_PRODUCT(pci_id)) {
+ switch (BKTR_PCI_PRODUCT(pci_id)) {
case PCI_PRODUCT_BROOKTREE_BT848:
if (rev == 0x12)
bktr->id = BROOKTREE_848A;
Modified: head/sys/dev/bktr/bktr_os.c
==
--- head/sys/dev/bktr/bktr_os.c Sun Jun 24 18:57:06 2018(r335605)
+++ head/sys/dev/bktr/bktr_os.c Sun Jun 24 19:01:01 2018(r335606)
@@ -287,9 +287,9 @@ bktr_probe( device_t dev )
unsigned int type = pci_get_devid(dev);
unsigned int rev = pci_get_revid(dev);
- if (PCI_VENDOR(type) == PCI_VENDOR_BROOKTREE)
+ if (BKTR_PCI_VENDOR(type) == PCI_VENDOR_BROOKTREE)
{
- switch (PCI_PRODUCT(type)) {
+ switch (BKTR_PCI_PRODUCT(type)) {
case PCI_PRODUCT_BROOKTREE_BT848:
if (rev == 0x12)
device_set_desc(dev, "BrookTree 848A");
@@ -922,11 +922,11 @@ bktr_probe(parent, match, aux)
{
struct pci_attach_args *pa = aux;
-if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_BROOKTREE &&
-(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT848 ||
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT849 ||
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT878 ||
- PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT879))
+if (BKTR_PCI_VENDOR(pa->pa_id) == PCI_VENDOR_BROOKTREE &&
+(BKTR_PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT848 ||
+ BKTR_PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT849 ||
+ BKTR_PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT878 ||
+ BKTR_PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROOKTREE_BT879))
return 1;
return 0;
Modified: head/sys/dev/bktr/bktr_reg.h
==
--- head/sys/dev/bktr/bktr_reg.hSun Jun 24 18:57:06 2018
(r335605)
+++ head/sys/dev/bktr/bktr_reg.hSun Jun 24 19:01:01 2018
(r335606)
@@ -88,15 +88,15 @@
* Definitions for the Brooktree 848/878 video capture to pci interface.
*/
#ifndef __NetBSD__
-#define PCI_VENDOR_SHIFT0
-#define PCI_VENDOR_MASK 0x
-#define PCI_VENDOR(id) \
-(((id) >> PCI_VENDOR_SHIFT) & PCI_VENDOR_MASK)
+#define BKTR_PCI_VENDOR_SHIFT0
+#define BKTR_PCI_VENDOR_MASK 0x
+#define BKTR_PCI_VENDOR(id) \
+(((id) >> BKTR_PCI_VENDOR_SHIFT) & BKTR_PCI_VENDOR_MASK)
-#define PCI_PRODUCT_SHIFT 16
-#define PCI_PRODUCT_MASK0x
-#define PCI_PRODUCT(id) \
-(((id) >> PCI_PRODUCT_SHIFT) & PCI_PRODUCT_MASK)
+#define BKTR_PCI_PRODUCT_SHIFT 16
+#define BKTR_PCI_PRODUCT_MASK0x
+#define BKTR_PCI_PRODUCT(id) \
+(((id) >> BKTR_PCI_PRODUCT_SHIFT) & BKTR_PCI_PRODUCT_MASK)
/* PCI vendor ID */
#define PCI_VENDOR_BROOKTREE0x109e/* Brooktree */
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335605 - in head/sys: kern sys
Author: mmacy
Date: Sun Jun 24 18:57:06 2018
New Revision: 335605
URL: https://svnweb.freebsd.org/changeset/base/335605
Log:
fix assert and conditionally allow mutexes to be held across
epoch_wait_preempt
Modified:
head/sys/kern/subr_epoch.c
head/sys/sys/epoch.h
Modified: head/sys/kern/subr_epoch.c
==
--- head/sys/kern/subr_epoch.c Sun Jun 24 15:22:38 2018(r335604)
+++ head/sys/kern/subr_epoch.c Sun Jun 24 18:57:06 2018(r335605)
@@ -375,9 +375,11 @@ epoch_block_handler_preempt(struct ck_epoch *global __
struct turnstile *ts;
struct lock_object *lock;
int spincount, gen;
+ int locksheld __unused;
record = __containerof(cr, struct epoch_record, er_record);
td = curthread;
+ locksheld = td->td_locks;
spincount = 0;
counter_u64_add(block_count, 1);
if (record->er_cpuid != curcpu) {
@@ -470,8 +472,8 @@ epoch_block_handler_preempt(struct ck_epoch *global __
turnstile_unlock(ts, lock);
thread_lock(td);
critical_exit();
- KASSERT(td->td_locks == 0,
- ("%d locks held", td->td_locks));
+ KASSERT(td->td_locks == locksheld,
+ ("%d extra locks held", td->td_locks - locksheld));
}
}
/*
@@ -499,23 +501,20 @@ epoch_wait_preempt(epoch_t epoch)
int old_cpu;
int old_pinned;
u_char old_prio;
-#ifdef INVARIANTS
- int locks;
+ int locks __unused;
- locks = curthread->td_locks;
-#endif
-
MPASS(cold || epoch != NULL);
INIT_CHECK(epoch);
-
- MPASS(epoch->e_flags & EPOCH_PREEMPT);
- WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
- "epoch_wait() can sleep");
-
td = curthread;
+#ifdef INVARIANTS
+ locks = curthread->td_locks;
+ MPASS(epoch->e_flags & EPOCH_PREEMPT);
+ if ((epoch->e_flags & EPOCH_LOCKED) == 0)
+ WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
+ "epoch_wait() can be long running");
KASSERT(td->td_epochnest == 0, ("epoch_wait() in the middle of an epoch
section"));
+#endif
thread_lock(td);
-
DROP_GIANT();
old_cpu = PCPU_GET(cpuid);
Modified: head/sys/sys/epoch.h
==
--- head/sys/sys/epoch.hSun Jun 24 15:22:38 2018(r335604)
+++ head/sys/sys/epoch.hSun Jun 24 18:57:06 2018(r335605)
@@ -39,6 +39,7 @@ struct epoch;
typedef struct epoch *epoch_t;
#define EPOCH_PREEMPT 0x1
+#define EPOCH_LOCKED 0x2
extern epoch_t global_epoch;
extern epoch_t global_epoch_preempt;
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335604 - head/share/examples/bhyve
Author: kib
Date: Sun Jun 24 15:22:38 2018
New Revision: 335604
URL: https://svnweb.freebsd.org/changeset/base/335604
Log:
bhyve/vmrun.sh: make -L functional.
Sponsored by: The FreeBSD Foundation
MFC after:3 days
Modified:
head/share/examples/bhyve/vmrun.sh
Modified: head/share/examples/bhyve/vmrun.sh
==
--- head/share/examples/bhyve/vmrun.sh Sun Jun 24 13:26:31 2018
(r335603)
+++ head/share/examples/bhyve/vmrun.sh Sun Jun 24 15:22:38 2018
(r335604)
@@ -134,7 +134,7 @@ vncport=${DEFAULT_VNCPORT}
vncsize=${DEFAULT_VNCSIZE}
tablet=""
-while getopts aAc:C:d:e:Ef:F:g:hH:iI:l:m:n:p:P:t:Tuvw c ; do
+while getopts aAc:C:d:e:Ef:F:g:hH:iI:l:L:m:n:p:P:t:Tuvw c ; do
case $c in
a)
bhyverun_opt="${bhyverun_opt} -a"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r335602 - head/sbin/dhclient
On Sun, 2018-06-24 at 13:23 +, Eitan Adler wrote: > Author: eadler > Date: Sun Jun 24 13:23:27 2018 > New Revision: 335602 > URL: https://svnweb.freebsd.org/changeset/base/335602 > > Log: > dhclient: build with WARNS=6 > > - add static in a number of places > - initialize __progname rather than rely on magical extern values > - use nitems() instead of manually spelling it out > - unshadow 'idi' > - teach 'error' that it is '__dead2' > - add missing 'break' The changes related to __progname aren't correct. __progname is a bsd- ism that goes back to at least 4.4BSD, including the need to locally have an extern char* decl to use it. You changed it to a file-static var definition without changing the name, and names beginning with a double underbar belong to the implementation and shouldn't be used locally. A more correct way to modernize code that uses __progname is to just replace each occurance of it with a call to getprogname(3) (and ensure stdlib.h has been included where it's used). References to the program name are typically not in performance-sensitive code so there's no need to even have a local var. (I think in libc, getprogname() is implemented as "return __progname"). -- Ian ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r335595 - head/etc
On Sat, 2018-06-23 at 21:24 -0700, Xin LI wrote: > Oh thanks for that. Is there a plan to MFC? Yes, I plan to mfc to 10 and 11 after a short while. -- Ian > On Sat, Jun 23, 2018 at 8:29 PM Ian Lepore wrote: > > > > > > Author: ian > > Date: Sun Jun 24 03:29:00 2018 > > New Revision: 335595 > > URL: https://svnweb.freebsd.org/changeset/base/335595 > > > > Log: > > Modernize usage of "restrict" keyword in ntp.conf > > > > It is no longer necessary to specify a -4/-6 flag on any ntp.conf > > keyword. The address type is inferred from the address itself as > > necessary. "restrict default" statements always apply to both > > address > > families regardless of any -4/-6 flag that may be present. > > > > So this change just tidies up our default config by removing the > > redundant > > restrict -6 statement and comment, and by removing the -6 flag > > from the > > restrict keyword that allows access from localhost. > > > > This change was inspired by the patches provided in PRs 201803 > > and 210245, > > and included some contrib/ntp code inspection to verify that the > > -4/-6 > > keywords are basically no-ops in all contexts now. > > > > PR: 201803 210245 > > Differential Revision:https://reviews.freebsd.org/D15974 > > > > Modified: > > head/etc/ntp.conf > > > > Modified: head/etc/ntp.conf > > === > > === > > --- head/etc/ntp.conf Sat Jun 23 23:44:36 2018(r335594) > > +++ head/etc/ntp.conf Sun Jun 24 03:29:00 2018(r335595) > > @@ -62,15 +62,13 @@ pool 0.freebsd.pool.ntp.org iburst > > # See http://support.ntp.org/bin/view/Support/AccessRestrictions > > # for more information. > > # > > -restrictdefault limited kod nomodify notrap noquery nopeer > > -restrict -6 default limited kod nomodify notrap noquery nopeer > > -restrictsource limited kod nomodify notrap noquery > > +restrict default limited kod nomodify notrap noquery nopeer > > +restrict source limited kod nomodify notrap noquery > > > > # > > # Alternatively, the following rules would block all unauthorized > > access. > > # > > #restrict default ignore > > -#restrict -6 default ignore > > # > > # In this case, all remote NTP time servers also need to be > > explicitly > > # allowed or they would not be able to exchange time information > > with > > @@ -85,7 +83,7 @@ restrictsource limited kod nomodify notrap > > noquer > > # > > # The following settings allow unrestricted access from the > > localhost > > restrict 127.0.0.1 > > -restrict -6 ::1 > > +restrict ::1 > > > > # > > # If a server loses sync with all upstream servers, NTP clients > > ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r335599 - svnadmin/conf
On 24/06/2018 14:20, Andriy Gapon wrote: > On 24/06/2018 15:52, Matthew Seaman wrote: >> Log: >> Approved by: core > > That's terse even by my standards. > Damn. Sorry about that -- fat fingered it. I had originally intended to say: Reactivate Daichi Goto's commit bit at his request. Daichi will be mentored by gnn while he reacquaints himself with how it all works. but missed out the 'Approved by:' flag. And then failed to fix the commit message properly. Matthew signature.asc Description: OpenPGP digital signature
svn commit: r335603 - stable/11/lib/libc/stdlib
Author: kib
Date: Sun Jun 24 13:26:31 2018
New Revision: 335603
URL: https://svnweb.freebsd.org/changeset/base/335603
Log:
MFC r334928:
libc qsort(3): stop aliasing.
PR: 228780
Modified:
stable/11/lib/libc/stdlib/qsort.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/libc/stdlib/qsort.c
==
--- stable/11/lib/libc/stdlib/qsort.c Sun Jun 24 13:23:27 2018
(r335602)
+++ stable/11/lib/libc/stdlib/qsort.c Sun Jun 24 13:26:31 2018
(r335603)
@@ -41,53 +41,27 @@ typedef int cmp_t(void *, const void *, const void
*
typedef int cmp_t(const void *, const void *);
#endif
static inline char *med3(char *, char *, char *, cmp_t *, void *);
-static inline void swapfunc(char *, char *, size_t, int, int);
#defineMIN(a, b) ((a) < (b) ? a : b)
/*
* Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
*/
-#defineswapcode(TYPE, parmi, parmj, n) { \
- size_t i = (n) / sizeof (TYPE); \
- TYPE *pi = (TYPE *) (parmi);\
- TYPE *pj = (TYPE *) (parmj);\
- do {\
- TYPEt = *pi;\
- *pi++ = *pj;\
- *pj++ = t; \
- } while (--i > 0); \
-}
-#defineSWAPINIT(TYPE, a, es) swaptype_ ## TYPE = \
- ((char *)a - (char *)0) % sizeof(TYPE) || \
- es % sizeof(TYPE) ? 2 : es == sizeof(TYPE) ? 0 : 1;
-
static inline void
-swapfunc(char *a, char *b, size_t n, int swaptype_long, int swaptype_int)
+swapfunc(char *a, char *b, size_t es)
{
- if (swaptype_long <= 1)
- swapcode(long, a, b, n)
- else if (swaptype_int <= 1)
- swapcode(int, a, b, n)
- else
- swapcode(char, a, b, n)
+ char t;
+
+ do {
+ t = *a;
+ *a++ = *b;
+ *b++ = t;
+ } while (--es > 0);
}
-#defineswap(a, b) \
- if (swaptype_long == 0) { \
- long t = *(long *)(a); \
- *(long *)(a) = *(long *)(b);\
- *(long *)(b) = t; \
- } else if (swaptype_int == 0) { \
- int t = *(int *)(a);\
- *(int *)(a) = *(int *)(b); \
- *(int *)(b) = t;\
- } else \
- swapfunc(a, b, es, swaptype_long, swaptype_int)
-
#definevecswap(a, b, n)\
- if ((n) > 0) swapfunc(a, b, n, swaptype_long, swaptype_int)
+ if ((n) > 0) swapfunc(a, b, n)
#ifdef I_AM_QSORT_R
#defineCMP(t, x, y) (cmp((t), (x), (y)))
@@ -119,17 +93,16 @@ qsort(void *a, size_t n, size_t es, cmp_t *cmp)
char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
size_t d1, d2;
int cmp_result;
- int swaptype_long, swaptype_int, swap_cnt;
+ int swap_cnt;
-loop: SWAPINIT(long, a, es);
- SWAPINIT(int, a, es);
+loop:
swap_cnt = 0;
if (n < 7) {
for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
for (pl = pm;
pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
pl -= es)
- swap(pl, pl - es);
+ swapfunc(pl, pl - es, es);
return;
}
pm = (char *)a + (n / 2) * es;
@@ -145,7 +118,7 @@ loop: SWAPINIT(long, a, es);
}
pm = med3(pl, pm, pn, cmp, thunk);
}
- swap(a, pm);
+ swapfunc(a, pm, es);
pa = pb = (char *)a + es;
pc = pd = (char *)a + (n - 1) * es;
@@ -153,7 +126,7 @@ loop: SWAPINIT(long, a, es);
while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) {
if (cmp_result == 0) {
swap_cnt = 1;
- swap(pa, pb);
+ swapfunc(pa, pb, es);
pa += es;
}
pb += es;
@@ -161,14 +134,14 @@ loop: SWAPINIT(long, a, es);
while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) {
if (cmp_result == 0) {
swap_cnt = 1;
- swap(pc, pd);
+ swapfunc(pc, pd, es);
pd -= es;
}
pc -= es;
}
svn commit: r335602 - head/sbin/dhclient
Author: eadler
Date: Sun Jun 24 13:23:27 2018
New Revision: 335602
URL: https://svnweb.freebsd.org/changeset/base/335602
Log:
dhclient: build with WARNS=6
- add static in a number of places
- initialize __progname rather than rely on magical extern values
- use nitems() instead of manually spelling it out
- unshadow 'idi'
- teach 'error' that it is '__dead2'
- add missing 'break'
Modified:
head/sbin/dhclient/Makefile
head/sbin/dhclient/bpf.c
head/sbin/dhclient/clparse.c
head/sbin/dhclient/conflex.c
head/sbin/dhclient/dhclient.c
head/sbin/dhclient/dhcpd.h
head/sbin/dhclient/dispatch.c
head/sbin/dhclient/options.c
head/sbin/dhclient/privsep.c
head/sbin/dhclient/privsep.h
Modified: head/sbin/dhclient/Makefile
==
--- head/sbin/dhclient/Makefile Sun Jun 24 13:14:04 2018(r335601)
+++ head/sbin/dhclient/Makefile Sun Jun 24 13:23:27 2018(r335602)
@@ -50,7 +50,6 @@ LIBADD+=cap_syslog
CFLAGS+=-DWITH_CASPER
.endif
-WARNS?=4
NO_WCAST_ALIGN=yes
HAS_TESTS=
Modified: head/sbin/dhclient/bpf.c
==
--- head/sbin/dhclient/bpf.cSun Jun 24 13:14:04 2018(r335601)
+++ head/sbin/dhclient/bpf.cSun Jun 24 13:23:27 2018(r335602)
@@ -95,7 +95,7 @@ if_register_bpf(struct interface_info *info, int flags
* Packet write filter program:
* 'ip and udp and src port bootps and dst port (bootps or bootpc)'
*/
-struct bpf_insn dhcp_bpf_wfilter[] = {
+static struct bpf_insn dhcp_bpf_wfilter[] = {
BPF_STMT(BPF_LD + BPF_B + BPF_IND, 14),
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, (IPVERSION << 4) + 5, 0, 12),
@@ -129,7 +129,7 @@ struct bpf_insn dhcp_bpf_wfilter[] = {
BPF_STMT(BPF_RET+BPF_K, 0),
};
-int dhcp_bpf_wfilter_len = sizeof(dhcp_bpf_wfilter) / sizeof(struct bpf_insn);
+static int dhcp_bpf_wfilter_len = nitems(dhcp_bpf_wfilter);
void
if_register_send(struct interface_info *info)
@@ -184,7 +184,7 @@ if_register_send(struct interface_info *info)
* XXX: Changes to the filter program may require changes to the
* constant offsets used in if_register_send to patch the BPF program!
*/
-struct bpf_insn dhcp_bpf_filter[] = {
+static struct bpf_insn dhcp_bpf_filter[] = {
/* Make sure this is an IP packet... */
BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12),
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, ETHERTYPE_IP, 0, 8),
@@ -211,7 +211,7 @@ struct bpf_insn dhcp_bpf_filter[] = {
BPF_STMT(BPF_RET+BPF_K, 0),
};
-int dhcp_bpf_filter_len = sizeof(dhcp_bpf_filter) / sizeof(struct bpf_insn);
+static int dhcp_bpf_filter_len = nitems(dhcp_bpf_filter);
void
if_register_receive(struct interface_info *info)
Modified: head/sbin/dhclient/clparse.c
==
--- head/sbin/dhclient/clparse.cSun Jun 24 13:14:04 2018
(r335601)
+++ head/sbin/dhclient/clparse.cSun Jun 24 13:23:27 2018
(r335602)
@@ -49,10 +49,9 @@ __FBSDID("$FreeBSD$");
#include "dhctoken.h"
struct client_config top_level_config;
-struct interface_info *dummy_interfaces;
-extern struct interface_info *ifi;
+static struct interface_info *dummy_interfaces;
-char client_script_name[] = "/sbin/dhclient-script";
+static char client_script_name[] = "/sbin/dhclient-script";
/*
* client-conf-file :== client-declarations EOF
Modified: head/sbin/dhclient/conflex.c
==
--- head/sbin/dhclient/conflex.cSun Jun 24 13:14:04 2018
(r335601)
+++ head/sbin/dhclient/conflex.cSun Jun 24 13:23:27 2018
(r335602)
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
int lexline;
int lexchar;
char *token_line;
-char *prev_line;
-char *cur_line;
+static char *prev_line;
+static char *cur_line;
const char *tlname;
int eol_token;
@@ -347,6 +347,7 @@ intern(char *atom, int dfv)
return (BOOTING);
if (!strcasecmp(atom + 1, "oot-unknown-clients"))
return (BOOT_UNKNOWN_CLIENTS);
+ break;
case 'c':
if (!strcasecmp(atom + 1, "lass"))
return (CLASS);
Modified: head/sbin/dhclient/dhclient.c
==
--- head/sbin/dhclient/dhclient.c Sun Jun 24 13:14:04 2018
(r335601)
+++ head/sbin/dhclient/dhclient.c Sun Jun 24 13:23:27 2018
(r335602)
@@ -65,9 +65,11 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
+
#ifndef _PATH_VAREMPTY
#define_PATH_VAREMPTY "/var/empty"
#endif
@@ -91,21 +93,21 @@ __FBSDID("$FreeBSD$");
cap_channel_t *capsyslog;
time_t cur_time;
-time_t default_lease_time = 43200; /* 12 hours... */
+static time_t default_lease_time = 43200; /*
Re: svn commit: r335599 - svnadmin/conf
On 24/06/2018 15:52, Matthew Seaman wrote: > Log: > Approved by:core That's terse even by my standards. -- Andriy Gapon ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335601 - head/usr.bin/top
Author: eadler Date: Sun Jun 24 13:14:04 2018 New Revision: 335601 URL: https://svnweb.freebsd.org/changeset/base/335601 Log: top(1): increase field with width for W/CPU column This allows 3 digit CPU columns to look nice Reported by: feld Modified: head/usr.bin/top/machine.c Modified: head/usr.bin/top/machine.c == --- head/usr.bin/top/machine.c Sun Jun 24 13:08:05 2018(r335600) +++ head/usr.bin/top/machine.c Sun Jun 24 13:14:04 2018(r335601) @@ -398,7 +398,7 @@ format_header(const char *uname_field) sbuf_cat(header, "C "); } sbuf_cat(header, "TIME "); - sbuf_printf(header, "%6s ", ps.wcpu ? "WCPU" : "CPU"); + sbuf_printf(header, " %6s ", ps.wcpu ? "WCPU" : "CPU"); sbuf_cat(header, "COMMAND"); sbuf_finish(header); break; @@ -1084,7 +1084,7 @@ format_next_process(struct handle * xhandle, char *(*g } sbuf_printf(procbuf, "%3d ", cpu); } - sbuf_printf(procbuf, "%6s", format_time(cputime)); + sbuf_printf(procbuf, "%6s ", format_time(cputime)); sbuf_printf(procbuf, "%6.2f%% ", ps.wcpu ? 100.0 * weighted_cpu(PCTCPU(pp), pp) : 100.0 * PCTCPU(pp)); } sbuf_printf(procbuf, "%.*s", ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335600 - head/sys/vm
Author: mjg
Date: Sun Jun 24 13:08:05 2018
New Revision: 335600
URL: https://svnweb.freebsd.org/changeset/base/335600
Log:
vm: stop passing M_ZERO when allocating radix nodes
Allocation explicitely initialized the 3 leading fields. The rest is an
array which is supposed to be NULL-ed prior to deallocation.
Delegate zeroing to the infrequently called object initializator.
This gets rid of one of the most common memset consumers.
Reviewed by: markj
Differential Revision:https://reviews.freebsd.org/D15989
Modified:
head/sys/vm/vm_radix.c
Modified: head/sys/vm/vm_radix.c
==
--- head/sys/vm/vm_radix.c Sun Jun 24 12:52:38 2018(r335599)
+++ head/sys/vm/vm_radix.c Sun Jun 24 13:08:05 2018(r335600)
@@ -112,7 +112,7 @@ vm_radix_node_get(vm_pindex_t owner, uint16_t count, u
{
struct vm_radix_node *rnode;
- rnode = uma_zalloc(vm_radix_node_zone, M_NOWAIT | M_ZERO);
+ rnode = uma_zalloc(vm_radix_node_zone, M_NOWAIT);
if (rnode == NULL)
return (NULL);
rnode->rn_owner = owner;
@@ -283,6 +283,16 @@ vm_radix_node_zone_dtor(void *mem, int size __unused,
}
#endif
+static int
+vm_radix_node_zone_init(void *mem, int size __unused, int flags __unused)
+{
+ struct vm_radix_node *rnode;
+
+ rnode = mem;
+ bzero(rnode, sizeof(*rnode));
+ return (0);
+}
+
#ifndef UMA_MD_SMALL_ALLOC
void vm_radix_reserve_kva(void);
/*
@@ -321,7 +331,7 @@ vm_radix_zinit(void)
#else
NULL,
#endif
- NULL, NULL, VM_RADIX_PAD, UMA_ZONE_VM);
+ vm_radix_node_zone_init, NULL, VM_RADIX_PAD, UMA_ZONE_VM);
}
/*
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335599 - svnadmin/conf
Author: matthew (ports committer) Date: Sun Jun 24 12:52:38 2018 New Revision: 335599 URL: https://svnweb.freebsd.org/changeset/base/335599 Log: Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessSun Jun 24 09:39:40 2018(r335598) +++ svnadmin/conf/accessSun Jun 24 12:52:38 2018(r335599) @@ -55,6 +55,7 @@ cracauer csjp cy dab +daichi davidcs dchagin def Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Sun Jun 24 09:39:40 2018(r335598) +++ svnadmin/conf/mentors Sun Jun 24 12:52:38 2018(r335599) @@ -15,6 +15,7 @@ anish neelCo-mentor: grehan arichardsonjhb Co-mentor: brooks bcran eadler brdallanjude Co-mentor: bapt +daichi gnn defpjd eriae Co-mentor: thompsa eugene avg Co-mentor: mav ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335598 - in head: sbin usr.bin
Author: eadler Date: Sun Jun 24 09:39:40 2018 New Revision: 335598 URL: https://svnweb.freebsd.org/changeset/base/335598 Log: Makefiles: remove outdated comments Modified: head/sbin/Makefile head/usr.bin/Makefile Modified: head/sbin/Makefile == --- head/sbin/Makefile Sun Jun 24 05:40:42 2018(r335597) +++ head/sbin/Makefile Sun Jun 24 09:39:40 2018(r335598) @@ -3,8 +3,6 @@ .include -# XXX MISSING: icheck ncheck - SUBDIR=adjkerntz \ camcontrol \ clri \ Modified: head/usr.bin/Makefile == --- head/usr.bin/Makefile Sun Jun 24 05:40:42 2018(r335597) +++ head/usr.bin/Makefile Sun Jun 24 09:39:40 2018(r335598) @@ -3,11 +3,6 @@ .include -# XXX MISSING: deroff diction graph learn plot -# spell spline struct xsend -# XXX Use GNU versions: diff ld patch -# - SUBDIR=alias \ apply \ asa \ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r335597 - head/sbin/newfs
Author: eadler
Date: Sun Jun 24 05:40:42 2018
New Revision: 335597
URL: https://svnweb.freebsd.org/changeset/base/335597
Log:
newfs: clean up warnings
- remove param: unused since r95357.
- correct definition of usage
- add explicit fallthrough notice. The existing one doesn't work with
our selection of "implicit-fallthrough" strictness.
This results in WARNS=6 building on amd64, but not other arches
Modified:
head/sbin/newfs/newfs.c
Modified: head/sbin/newfs/newfs.c
==
--- head/sbin/newfs/newfs.c Sun Jun 24 03:31:23 2018(r335596)
+++ head/sbin/newfs/newfs.c Sun Jun 24 05:40:42 2018(r335597)
@@ -121,7 +121,7 @@ static char *dkname;
static char*disktype;
static void getfssize(intmax_t *, const char *p, intmax_t, intmax_t);
-static struct disklabel *getdisklabel(char *s);
+static struct disklabel *getdisklabel(void);
static void usage(void);
static int expand_number_int(const char *buf, int *num);
@@ -185,6 +185,7 @@ main(int argc, char *argv[])
case 'j':
jflag = 1;
/* fall through to enable soft updates */
+ /* FALLTHROUGH */
case 'U':
Uflag = 1;
break;
@@ -351,7 +352,7 @@ main(int argc, char *argv[])
getfssize(, special, mediasize / sectorsize, reserved);
}
pp = NULL;
- lp = getdisklabel(special);
+ lp = getdisklabel();
if (lp != NULL) {
if (!is_file) /* already set for files */
part_name = special[strlen(special) - 1];
@@ -426,7 +427,7 @@ getfssize(intmax_t *fsz, const char *s, intmax_t disks
}
struct disklabel *
-getdisklabel(char *s)
+getdisklabel(void)
{
static struct disklabel lab;
struct disklabel *lp;
@@ -453,7 +454,7 @@ getdisklabel(char *s)
}
static void
-usage()
+usage(void)
{
fprintf(stderr,
"usage: %s [ -fsoptions ] special-device%s\n",
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
