Re: svn commit: r310138 - head/lib/libc/stdio
... just have printf_freebsd in libutil; have it know about our
extended fmt types.
then we just have to port libutil to a target platform.
-a
On 16 December 2016 at 17:31, Eric van Gyzen wrote:
> On 12/16/2016 17:44, Warner Losh wrote:
>> On Fri, Dec 16, 2016 at 3:07 PM, John Baldwin wrote:
>>> On Friday, December 16, 2016 04:53:04 PM Eric van Gyzen wrote:
On 12/16/2016 16:45, John Baldwin wrote:
> On Friday, December 16, 2016 08:53:26 PM Dimitry Andric wrote:
>> On 16 Dec 2016, at 20:31, Baptiste Daroussin wrote:
>>>
>>> On Fri, Dec 16, 2016 at 01:44:51AM +, Conrad E. Meyer wrote:
Author: cem
Date: Fri Dec 16 01:44:50 2016
New Revision: 310138
URL: https://svnweb.freebsd.org/changeset/base/310138
Log:
vfprintf(3): Add support for kernel %b format
This is a direct port of the kernel %b format.
I'm unclear on if (more) non-portable printf extensions will be a
problem. I think it's desirable to have userspace formats include all
kernel formats, but there may be competing goals I'm not aware of.
Reviewed by:no one, unfortunately
Sponsored by: Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D8426
>>>
>>> I really don't think it is a good idea, if used in userland it would be
>>> make
>>> more of our code difficult to port elsewhere.
>>
>> Indeed, this is a bad idea. These custom format specifiers should be
>> eliminated, not multiplied. :-)
>>
>>
>>> Other than that, it makes more difficult to use vanilla gcc with out
>>> userland.
>>> and it is adding more complexity to be able to build freebsd from a non
>>> freebsd
>>> system which some people are working on.
>>>
>>> Personnaly I would prefer to see those extensions removed from the
>>> kernel rather
>>> than see them available in userland.
>>
>> Same here.
>>
>>
>>> Can't we use simple helper function instead?
>>
>> Yes, please. Just take the snprintb(3) function from NetBSD:
>>
>> http://netbsd.gw.com/cgi-bin/man-cgi?snprintb+3+NetBSD-current
>
> In general I agree with something like this instead, but it is quite a
> bit more
> tedious to use as you have to run it once to determine the length,
> allocate a
> buffer, and then run it again. Calling malloc() for that buffer isn't
> always
> convenient in the kernel (though it should be fine in userland). Having
> it live
> in printf() itself means the output is generated to the stream without
> having to
> manage a variable-sized intermediate buffer.
I imagine most callers can simply use a char[sizeof(fmt)+C] on the stack,
where
C is some constant that I haven't taken the time to calculate, at the risk
of
making myself look foolish and unprofessional.
>>>
>>> Hmm, that might work, but it is still cumbersome. Probably to make things
>>> readable
>>> we'd end up with a wrapper:
>>>
>>> printb(uint val, const char *fmt)
>>> {
>>>char buf[strlen(fmt) + C];
>>>
>>>snprintb(...);
>>>printf("%s", buf);
>>> }
>>
>> Sadly this "cure" is worse than the disease.
>
> How about this cure?
>
> printf("reg=%b\n", value, FORMAT);
>
> // versus
>
> char buf[BITMASK_BUFFER_SIZE(FORMAT)];
> printf("reg=%s\n", format_bitmask(buf, sizeof(buf), value, FORMAT));
>
> That doesn't seem so bad.
>
> Eric
>
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r310051 - in head: share/man/man9 sys/kern sys/sys
Hi Dimitry, 2016-12-16 23:55 GMT+01:00 Dimitry Andric : > Since this now causes VMware kernel modules to insta-panic the kernel, > it might be nice to put some warning in UPDATING, at least. Luckily > __FreeBSD_version got bumped by Adrian in r310149 for something > unrelated, but this is definitely something to notify maintainers of > ports (with kernel modules) about too. This change affects the KBI, as sysctl declarations now include an additional pointer. The underlying sysctl registration function also gained an additional argument. That said, if you simply rebuild all kernel modules, this shouldn't cause any regressions, or are you saying those persist? If so, this is definitely not an intended side-effect of this change and we should look into it. -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r310138 - head/lib/libc/stdio
On 16 Dec 2016, at 19:31, Baptiste Daroussin wrote: > > Other than that, it makes more difficult to use vanilla gcc with out userland. > and it is adding more complexity to be able to build freebsd from a non > freebsd > system which some people are working on. Why? You’ll get some spurious warnings about printf, but that’s all. Our printf (like the glibc one) already supports user-defined extensions via register_printf_function (for which, I note, we don’t have a man page), so third-party code also has some of these warnings if they’ve registered other printf handlers. I’d actually consider that to be the biggest argument against adding %b support: we support users adding their own interpretation of %b via register_printf_function and this will break anyone third-party code where people do this. This commit is doubly bad, because not only does it change our ABI, it doesn’t document the fact. The code in this commit is also simply broken. It does not add a corresponding handler in xprintf.c, so as soon as someone calls register_printf_function with *any* argument, printf’s ability to handle %b will be broken in a difficult-to-debug way. David smime.p7s Description: S/MIME cryptographic signature
Re: svn commit: r310051 - in head: share/man/man9 sys/kern sys/sys
On 17 Dec 2016, at 10:43, Ed Schouten wrote: > > 2016-12-16 23:55 GMT+01:00 Dimitry Andric : >> Since this now causes VMware kernel modules to insta-panic the kernel, >> it might be nice to put some warning in UPDATING, at least. Luckily >> __FreeBSD_version got bumped by Adrian in r310149 for something >> unrelated, but this is definitely something to notify maintainers of >> ports (with kernel modules) about too. > > This change affects the KBI, as sysctl declarations now include an > additional pointer. The underlying sysctl registration function also > gained an additional argument. That said, if you simply rebuild all > kernel modules, this shouldn't cause any regressions, or are you > saying those persist? If so, this is definitely not an intended > side-effect of this change and we should look into it. Well, the kernel module doesn't compile anymore, of course: os.c:894:46: error: too few arguments to function call, expected 11, have 10 BALLOON_NAME_VERBOSE); ^ /usr/src/sys/sys/sysctl.h:1014:1: note: 'sysctl_add_oid' declared here struct sysctl_oid *sysctl_add_oid(struct sysctl_ctx_list *clist, ^ 1 error generated. I am unsure why the VMware modules don't use the SYSCTL_XXX macros. Maybe these were not available in the past? Only the original maintainers might know. In any case, I have submitted a PR with a build fix, making use of the unrelated __FreeBSD_version bump, to add an additional NULL parameter to the call: https://bugs.freebsd.org/215353 -Dimitry signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r310138 - head/lib/libc/stdio
On 17 Dec 2016, at 12:46, David Chisnall wrote: > > On 16 Dec 2016, at 19:31, Baptiste Daroussin wrote: >> >> Other than that, it makes more difficult to use vanilla gcc with out >> userland. >> and it is adding more complexity to be able to build freebsd from a non >> freebsd >> system which some people are working on. > > Why? You’ll get some spurious warnings about printf, but that’s all. Unfortunately, we compile large parts of the tree with -Werror. Thus, "spurious warnings" will break the build, leaving the user two options: disabling -Wformat warnings, or disabling -Werror altogether, neither of which are very recommendable. As far as I know, there is no -Wno-error-on-undefined-printf-specifiers. It would also be hard to implement, since after any undefined specifiers have been encountered, you cannot reason about the following ones anymore either. IMHO, if people want to use non-standard specifiers, let them define their own almost_printf_but_not_quite() functions, and forgo any format checking. -Dimitry signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r310189 - head/sys/arm/ti/cpsw
Author: skra
Date: Sat Dec 17 18:03:03 2016
New Revision: 310189
URL: https://svnweb.freebsd.org/changeset/base/310189
Log:
Fix sscanf() format string to match an argument. This also fixes kernel
build after r310171.
MFC after:1 weeks
Modified:
head/sys/arm/ti/cpsw/if_cpsw.c
Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==
--- head/sys/arm/ti/cpsw/if_cpsw.c Sat Dec 17 03:47:09 2016
(r310188)
+++ head/sys/arm/ti/cpsw/if_cpsw.c Sat Dec 17 18:03:03 2016
(r310189)
@@ -746,7 +746,7 @@ cpsw_get_fdt_data(struct cpsw_softc *sc,
for (child = OF_child(sc->node); child != 0; child = OF_peer(child)) {
if (OF_getprop_alloc(child, "name", 1, (void **)&name) < 0)
continue;
- if (sscanf(name, "slave@%x", &mdio_child_addr) != 1) {
+ if (sscanf(name, "slave@%lx", &mdio_child_addr) != 1) {
OF_prop_free(name);
continue;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r310190 - head/sys/dev/uart
Author: jchandra
Date: Sat Dec 17 18:04:59 2016
New Revision: 310190
URL: https://svnweb.freebsd.org/changeset/base/310190
Log:
Simplify interrupt mask programming in pl011 uart
Remove unused fields from uart_pl011_softc. Add an interrupt mask
field to the softc and use it to set the interrupt mask register.
There should be no functional change introduced here except in the
grab and ungrab functions. In these functions, we now disable and
enable all interrupts rather than just the receive interrupt.
Modified:
head/sys/dev/uart/uart_dev_pl011.c
Modified: head/sys/dev/uart/uart_dev_pl011.c
==
--- head/sys/dev/uart/uart_dev_pl011.c Sat Dec 17 18:03:03 2016
(r310189)
+++ head/sys/dev/uart/uart_dev_pl011.c Sat Dec 17 18:04:59 2016
(r310190)
@@ -238,13 +238,8 @@ uart_pl011_getc(struct uart_bas *bas, st
* High-level UART interface.
*/
struct uart_pl011_softc {
- struct uart_softc base;
- uint8_t fcr;
- uint8_t ier;
- uint8_t mcr;
-
- uint8_t ier_mask;
- uint8_t ier_rxbits;
+ struct uart_softc base;
+ uint16_timsc; /* Interrupt mask */
};
static int uart_pl011_bus_attach(struct uart_softc *);
@@ -309,14 +304,15 @@ UART_ACPI_CLASS_AND_DEVICE(acpi_compat_d
static int
uart_pl011_bus_attach(struct uart_softc *sc)
{
+ struct uart_pl011_softc *psc;
struct uart_bas *bas;
- int reg;
+ psc = (struct uart_pl011_softc *)sc;
bas = &sc->sc_bas;
/* Enable interrupts */
- reg = (UART_RXREADY | RIS_RTIM | UART_TXEMPTY);
- __uart_setreg(bas, UART_IMSC, reg);
+ psc->imsc = (UART_RXREADY | RIS_RTIM | UART_TXEMPTY);
+ __uart_setreg(bas, UART_IMSC, psc->imsc);
/* Clear interrupts */
__uart_setreg(bas, UART_ICR, IMSC_MASK_ALL);
@@ -372,12 +368,14 @@ uart_pl011_bus_ioctl(struct uart_softc *
static int
uart_pl011_bus_ipend(struct uart_softc *sc)
{
+ struct uart_pl011_softc *psc;
struct uart_bas *bas;
uint32_t ints;
int ipend;
- int reg;
+ psc = (struct uart_pl011_softc *)sc;
bas = &sc->sc_bas;
+
uart_lock(sc->sc_hwmtx);
ints = __uart_getreg(bas, UART_MIS);
ipend = 0;
@@ -393,9 +391,7 @@ uart_pl011_bus_ipend(struct uart_softc *
ipend |= SER_INT_TXIDLE;
/* Disable TX interrupt */
- reg = __uart_getreg(bas, UART_IMSC);
- reg &= ~(UART_TXEMPTY);
- __uart_setreg(bas, UART_IMSC, reg);
+ __uart_setreg(bas, UART_IMSC, psc->imsc & ~UART_TXEMPTY);
}
uart_unlock(sc->sc_hwmtx);
@@ -472,10 +468,11 @@ uart_pl011_bus_setsig(struct uart_softc
static int
uart_pl011_bus_transmit(struct uart_softc *sc)
{
+ struct uart_pl011_softc *psc;
struct uart_bas *bas;
- int reg;
int i;
+ psc = (struct uart_pl011_softc *)sc;
bas = &sc->sc_bas;
uart_lock(sc->sc_hwmtx);
@@ -489,9 +486,7 @@ uart_pl011_bus_transmit(struct uart_soft
sc->sc_txbusy = 1;
/* Enable TX interrupt */
- reg = __uart_getreg(bas, UART_IMSC);
- reg |= (UART_TXEMPTY);
- __uart_setreg(bas, UART_IMSC, reg);
+ __uart_setreg(bas, UART_IMSC, psc->imsc);
}
uart_unlock(sc->sc_hwmtx);
@@ -506,23 +501,29 @@ uart_pl011_bus_transmit(struct uart_soft
static void
uart_pl011_bus_grab(struct uart_softc *sc)
{
+ struct uart_pl011_softc *psc;
struct uart_bas *bas;
+ psc = (struct uart_pl011_softc *)sc;
bas = &sc->sc_bas;
+
+ /* Disable interrupts on switch to polling */
uart_lock(sc->sc_hwmtx);
- __uart_setreg(bas, UART_IMSC, /* Switch to RX polling while grabbed */
- ~UART_RXREADY & __uart_getreg(bas, UART_IMSC));
+ __uart_setreg(bas, UART_IMSC, psc->imsc & ~IMSC_MASK_ALL);
uart_unlock(sc->sc_hwmtx);
}
static void
uart_pl011_bus_ungrab(struct uart_softc *sc)
{
+ struct uart_pl011_softc *psc;
struct uart_bas *bas;
+ psc = (struct uart_pl011_softc *) sc;
bas = &sc->sc_bas;
+
+ /* Switch to using interrupts while not grabbed */
uart_lock(sc->sc_hwmtx);
- __uart_setreg(bas, UART_IMSC, /* Switch to RX interrupts while not
grabbed */
- UART_RXREADY | __uart_getreg(bas, UART_IMSC));
+ __uart_setreg(bas, UART_IMSC, psc->imsc);
uart_unlock(sc->sc_hwmtx);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r307684 - head/sbin/camcontrol
On 12/12/16, Kenneth D. Merry wrote: > On Sun, Dec 11, 2016 at 00:49:12 +0100, Oliver Pinter wrote: >> On 10/20/16, Kenneth D. Merry wrote: >> > Author: ken >> > Date: Thu Oct 20 19:42:26 2016 >> > New Revision: 307684 >> > URL: https://svnweb.freebsd.org/changeset/base/307684 >> > >> > Log: >> > For CCBs allocated on the stack, we need to clear the entire CCB, not >> > just >> > the header. Otherwise stack garbage can lead to random flags getting >> > set. >> > >> > This showed up as 'camcontrol rescan all' failing with EINVAL because >> > the >> > address type wasn't CAM_DATA_VADDR. >> > >> > sbin/camcontrol/camcontrol.c: >> >In rescan_or_reset_bus(), bzero the stack-allocated CCBs before >> >use instead of clearing the body. >> > >> > MFC after: 3 days >> > Sponsored by:Spectra Logic >> >> The MFC of this commit is missed both for 10-STABLE and 11-STABLE. Is >> this still in plan to do? > > Done, thanks for the reminder! Thanks! Slightly related problem what I found on one of my INVARIANTS enabled kernel is the following: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=215356 . A similar change what this is required in smartmontools too. > > Ken > -- > Kenneth Merry > k...@freebsd.org > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r310193 - head/sys/netinet
Author: tuexen
Date: Sat Dec 17 22:31:30 2016
New Revision: 310193
URL: https://svnweb.freebsd.org/changeset/base/310193
Log:
Fix the handling of buffered messages in stream reset deferred handling.
Thanks to Eugen-Andrei Gavriloaie for reporting the issue and providing
substantial help in nailing down the issue.
MFC after:1 week
Modified:
head/sys/netinet/sctp_indata.c
Modified: head/sys/netinet/sctp_indata.c
==
--- head/sys/netinet/sctp_indata.c Sat Dec 17 18:35:17 2016
(r310192)
+++ head/sys/netinet/sctp_indata.c Sat Dec 17 22:31:30 2016
(r310193)
@@ -472,7 +472,6 @@ sctp_clean_up_control(struct sctp_tcb *s
*/
static void
sctp_queue_data_to_stream(struct sctp_tcb *stcb,
-struct sctp_stream_in *strm,
struct sctp_association *asoc,
struct sctp_queued_to_read *control, int *abort_flag, int *need_reasm)
{
@@ -498,16 +497,17 @@ sctp_queue_data_to_stream(struct sctp_tc
int queue_needed;
uint32_t nxt_todel;
struct mbuf *op_err;
+ struct sctp_stream_in *strm;
char msg[SCTP_DIAG_INFO_LEN];
+ strm = &asoc->strmin[control->sinfo_stream];
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_STR_LOGGING_ENABLE) {
sctp_log_strm_del(control, NULL, SCTP_STR_LOG_FROM_INTO_STRD);
}
if (SCTP_MID_GT((asoc->idata_supported), strm->last_mid_delivered,
control->mid)) {
/* The incoming sseq is behind where we last delivered? */
SCTPDBG(SCTP_DEBUG_INDATA1, "Duplicate S-SEQ: %u delivered: %u
from peer, Abort association\n",
- control->mid, strm->last_mid_delivered);
-protocol_error:
+ strm->last_mid_delivered, control->mid);
/*
* throw it in the stream so it gets cleaned up in
* association destruction
@@ -531,9 +531,6 @@ protocol_error:
return;
}
- if ((SCTP_TSN_GE(asoc->cumulative_tsn, control->sinfo_tsn)) &&
(asoc->idata_supported == 0)) {
- goto protocol_error;
- }
queue_needed = 1;
asoc->size_on_all_streams += control->length;
sctp_ucount_incr(asoc->cnt_on_all_streams);
@@ -1041,7 +1038,7 @@ sctp_deliver_reasm_check(struct sctp_tcb
}
control = TAILQ_FIRST(&strm->uno_inqueue);
- if ((control) &&
+ if ((control != NULL) &&
(asoc->idata_supported == 0)) {
/* Special handling needed for "old" data format */
if (sctp_handle_old_unordered_data(stcb, asoc, strm, control,
pd_point, inp_read_lock_held)) {
@@ -1280,7 +1277,6 @@ sctp_add_chk_to_control(struct sctp_queu
*/
static void
sctp_queue_data_for_reasm(struct sctp_tcb *stcb, struct sctp_association *asoc,
-struct sctp_stream_in *strm,
struct sctp_queued_to_read *control,
struct sctp_tmit_chunk *chk,
int created_control,
@@ -1288,8 +1284,10 @@ sctp_queue_data_for_reasm(struct sctp_tc
{
uint32_t next_fsn;
struct sctp_tmit_chunk *at, *nat;
+ struct sctp_stream_in *strm;
int do_wakeup, unordered;
+ strm = &asoc->strmin[control->sinfo_stream];
/*
* For old un-ordered data chunks.
*/
@@ -1582,7 +1580,6 @@ sctp_process_a_data_chunk(struct sctp_tc
uint32_t ppid;
uint8_t chk_flags;
struct sctp_stream_reset_list *liste;
- struct sctp_stream_in *strm;
int ordered;
size_t clen;
int created_control = 0;
@@ -1733,7 +1730,6 @@ sctp_process_a_data_chunk(struct sctp_tc
}
return (0);
}
- strm = &asoc->strmin[sid];
/*
* If its a fragmented message, lets see if we can find the control
* on the reassembly queues.
@@ -1750,7 +1746,7 @@ sctp_process_a_data_chunk(struct sctp_tc
mid, chk_flags);
goto err_out;
}
- control = sctp_find_reasm_entry(strm, mid, ordered,
asoc->idata_supported);
+ control = sctp_find_reasm_entry(&asoc->strmin[sid], mid, ordered,
asoc->idata_supported);
SCTPDBG(SCTP_DEBUG_XXX, "chunk_flags:0x%x look for control on queues
%p\n",
chk_flags, control);
if ((chk_flags & SCTP_DATA_NOT_FRAG) != SCTP_DATA_NOT_FRAG) {
@@ -2020,7 +2016,7 @@ sctp_process_a_data_chunk(struct sctp_tc
if ((chk_flags & SCTP_DATA_UNORDERED) == 0) {
/* for ordered, bump what we delivered */
- strm->last_mid_delivered++;
+ asoc->strmin[sid].last_mid_delivered++;
}
SCTP_STAT_INCR(sctps_recvexpress);
if (SCTP_BASE_SYSCTL(sctp_logging_level) &
SCTP_STR_LOGGING_ENABLE) {
@@ -2130,7 +2126,7 @@ sctp_process_a_data_chunk(struct sctp_tc
} else {
SCTPDBG(SCTP_DEBUG_X
svn commit: r310194 - in head: . contrib/compiler-rt/lib/builtins contrib/libc++/include contrib/llvm/include/llvm/Analysis contrib/llvm/include/llvm/ExecutionEngine contrib/llvm/include/llvm/IR co...
lugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp head/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp head/etc/mtree/BSD.debug.dist head/etc/mtree/BSD.usr.dist head/lib/clang/freebsd_cc_version.h head/lib/clang/headers/Makefile head/lib/clang/include/clang/Basic/Version.inc head/lib/clang/include/clang/Config/config.h head/lib/clang/include/llvm/Config/config.h head/lib/clang/include/llvm/Config/llvm-config.h head/lib/libclang_rt/Makefile.inc head/lib/libcompiler_rt/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: head/ (props changed) head/cddl/ (props changed) head/cddl/contrib/opensolaris/ (props changed) head/contrib/binutils/ (props changed) head/contrib/byacc/ (props changed) head/contrib/compiler-rt/ (props changed) head/contrib/dma/ (props changed) head/contrib/elftoolchain/ (props changed) head/contrib/groff/ (props changed) head/contrib/libarchive/ (props changed) head/contrib/libc++/ (props changed) head/contrib/libc-vis/ (props changed) head/contrib/llvm/ (props changed) head/contrib/llvm/tools/clang/ (props changed) head/contrib/llvm/tools/lld/ (props changed) head/contrib/llvm/tools/lldb/ (props changed) head/contrib/netbsd-tests/ (props changed) head/contrib/subversion/ (props changed) head/contrib/tcpdump/ (props changed) head/contrib/tzdata/ (props changed) head/sys/amd64/amd64/efirt.c (props changed) head/sys/cddl/contrib/opensolaris/ (props changed) Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sat Dec 17 22:31:30 2016(r310193) +++ head/ObsoleteFiles.inc Sat Dec 17 22:34:19 2016(r310194) @@ -38,6 +38,115 @@ # xargs -n1 | sort | uniq -d; # done +# 20161217: new clang import which bumps version from 3.9.0 to 3.9.1. +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/esan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/3.9.0/include/sanitizer +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/3.9.0/include/adxintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/altivec.h +OLD_FILES+=usr/lib/clang/3.9.0/include/ammintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/arm_acle.h +OLD_FILES+=usr/lib/clang/3.9.0/include/arm_neon.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmaintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmavlintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512pfintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmiintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmivlintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlcdintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avxintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/clflushoptintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/cpuid.h +OLD_FILES+=usr/lib/clang/3.9.0/include/cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/3.9.0/include/emmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/htmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/htmxlintrin
svn commit: r310196 - head/usr.sbin/bsnmpd/modules/snmp_bridge
Author: ngie
Date: Sun Dec 18 00:44:43 2016
New Revision: 310196
URL: https://svnweb.freebsd.org/changeset/base/310196
Log:
Fix some minor typos with begemotBridgeTpLearnedEntryDiscards and
begemotBridgeTpMaxAddresses
Bump LAST-UPDATED for the MIB, per the change
MFC after:1 week
Modified:
head/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
Modified: head/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt
==
--- head/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt Sun Dec
18 00:39:04 2016(r310195)
+++ head/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt Sun Dec
18 00:44:43 2016(r310196)
@@ -41,7 +41,7 @@ IMPORTS
FROM BEGEMOT-MIB;
begemotBridge MODULE-IDENTITY
-LAST-UPDATED "20070806Z"
+LAST-UPDATED "20161217Z"
ORGANIZATION "Sofia University St. Kliment Ohridski"
CONTACT-INFO
" Shteryana Shopova
@@ -56,6 +56,9 @@ begemotBridge MODULE-IDENTITY
E-Mail:syr...@freebsd.org"
DESCRIPTION
"The Begemot MIB for managing bridge interfaces."
+REVISION "20161217Z"
+DESCRIPTION
+"Address some minor typos and grammar mistakes."
REVISION "20070806Z"
DESCRIPTION
"Third revision adds begemotBridgeBasePortPrivate
@@ -856,7 +859,7 @@ begemotBridgeTpLearnedEntryDiscards OBJE
DESCRIPTION
"The total number of Forwarding Database entries that would
have been learnt, but have been discarded due to Forwarding
- Address Table having reached it's maximum entries limit."
+ Address Table having reached its maximum entries limit."
::= { begemotBridgeTpEntry 1 }
begemotBridgeTpAgingTime OBJECT-TYPE
@@ -874,7 +877,7 @@ begemotBridgeTpMaxAddresses OBJECT-TYPE
MAX-ACCESS read-write
STATUS current
DESCRIPTION
- "The maximum number of entires that this bridge can
+ "The maximum number of entries that this bridge can
learn in its Forwarding Address Table and use for
making forwarding decisions."
::= { begemotBridgeTpEntry 3 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r310197 - in head/tools/tools/locale: . etc
Author: bapt Date: Sun Dec 18 01:52:16 2016 New Revision: 310197 URL: https://svnweb.freebsd.org/changeset/base/310197 Log: Prepare import of CLDR v30.3 and unicode 9.0.0 Upstream kk_Cyrl_KZ has been renamed kk_KZ Upstream mn_Cyrl_MN has been renamed mn_MN For ru_RU: the default currency for unicode is now ₽ which is not mapped to other encoding, add charmaps entries to be able to generate them Modified: head/tools/tools/locale/Makefile head/tools/tools/locale/etc/charmaps.xml head/tools/tools/locale/etc/unicode.conf Modified: head/tools/tools/locale/Makefile == --- head/tools/tools/locale/MakefileSun Dec 18 00:44:43 2016 (r310196) +++ head/tools/tools/locale/MakefileSun Dec 18 01:52:16 2016 (r310197) @@ -118,7 +118,7 @@ BASE_LOCALES_OF_INTEREST?= \ nb_NO nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT ro_RO \ ru_RU se_FI se_NO sk_SK sl_SI sv_FI sv_SE tr_TR \ uk_UA \ - kk_Cyrl_KZ mn_Cyrl_MN sr_Cyrl_RS sr_Latn_RS \ + kk_KZ mn_MN sr_Cyrl_RS sr_Latn_RS \ zh_Hans_CN zh_Hant_HK zh_Hant_TW \ bn_IN gu_IN or_IN ta_IN te_IN kn_IN ml_IN si_LK \ th_TH lo_LA bo_IN my_MM pa_Guru_IN ka_GE chr_US \ Modified: head/tools/tools/locale/etc/charmaps.xml == --- head/tools/tools/locale/etc/charmaps.xmlSun Dec 18 00:44:43 2016 (r310196) +++ head/tools/tools/locale/etc/charmaps.xmlSun Dec 18 01:52:16 2016 (r310197) @@ -117,7 +117,6 @@ encoding="SJIS eucJP" countries="JP" /> + + + + Modified: head/tools/tools/locale/etc/unicode.conf == --- head/tools/tools/locale/etc/unicode.confSun Dec 18 00:44:43 2016 (r310196) +++ head/tools/tools/locale/etc/unicode.confSun Dec 18 01:52:16 2016 (r310197) @@ -1,2 +1,4 @@ -cldr ~/unicode/cldr/27.0.1 -unidata ~/unicode/UNIDATA/8.0.0 +# $FreeBSD$ + +cldr ~/unicode/cldr/30.0.3 +unidata ~/unicode/UNIDATA/9.0.0 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r310198 - head/tools/tools/locale/tools
Author: bapt
Date: Sun Dec 18 02:02:33 2016
New Revision: 310198
URL: https://svnweb.freebsd.org/changeset/base/310198
Log:
Simplify extraction of static collation definition
Modified:
head/tools/tools/locale/tools/extract-colldef.awk
Modified: head/tools/tools/locale/tools/extract-colldef.awk
==
--- head/tools/tools/locale/tools/extract-colldef.awk Sun Dec 18 01:52:16
2016(r310197)
+++ head/tools/tools/locale/tools/extract-colldef.awk Sun Dec 18 02:02:33
2016(r310198)
@@ -5,14 +5,8 @@ BEGIN {
print "# from CLDR project data, obtained from http://cldr.unicode.org/";
print "#
-"
}
-$1 == "comment_char" { print $0 }
-$1 == "escape_char" { print $0 }
-$1 == "LC_COLLATE" {
- print $0
- while (getline line) {
- print line
- if (line == "END LC_COLLATE") {
- break
- }
- }
-}
+$1 == "comment_char" { print }
+$1 == "escape_char" { print }
+$1 == "LC_COLLATE" { doprint = 1 }
+doprint == 1 { print }
+$1 == "END" && $2 == "LC_COLLATE" { exit 0 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r310138 - head/lib/libc/stdio
On Sat, 17 Dec 2016, Dimitry Andric wrote: On 17 Dec 2016, at 12:46, David Chisnall wrote: On 16 Dec 2016, at 19:31, Baptiste Daroussin wrote: Other than that, it makes more difficult to use vanilla gcc with out userland. and it is adding more complexity to be able to build freebsd from a non freebsd system which some people are working on. Why? You???ll get some spurious warnings about printf, but that???s all. Unfortunately, we compile large parts of the tree with -Werror. Thus, "spurious warnings" will break the build, leaving the user two options: disabling -Wformat warnings, or disabling -Werror altogether, neither of which are very recommendable. As far as I know, there is no -Wno-error-on-undefined-printf-specifiers. It would also be hard to implement, since after any undefined specifiers have been encountered, you cannot reason about the following ones anymore either. IMHO, if people want to use non-standard specifiers, let them define their own almost_printf_but_not_quite() functions, and forgo any format checking. That would be worse than breaking format checking for the selected set of printf()s. It gives even more unportability. %b is a BSDism that would be detected at compile time on systems without support for %b in printf(). almost_printf_but_not_quite() is a FreeBSDism that would be detected at compile time on systems without the function. Using it breaks portability even to other BSD systems including previous versions of FreeBSD. People who want to use non-standard specifiers added support to check them the compiler. Bruce___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r310199 - head/tools/tools/locale/tools
Author: bapt
Date: Sun Dec 18 04:11:13 2016
New Revision: 310199
URL: https://svnweb.freebsd.org/changeset/base/310199
Log:
Better handle posix names for locales
Modified:
head/tools/tools/locale/tools/finalize
Modified: head/tools/tools/locale/tools/finalize
==
--- head/tools/tools/locale/tools/finalize Sun Dec 18 02:02:33 2016
(r310198)
+++ head/tools/tools/locale/tools/finalize Sun Dec 18 04:11:13 2016
(r310199)
@@ -41,20 +41,29 @@ AWKCMD="/## PLACEHOLDER/ { \
# Rename the sources with 3 components name into the POSIX version of the name
using @modifier
cd $old
+pwd
for i in *_*_*.*.src; do
+ if [ "$i" = "*_*_*.*.src" ]; then
+ break
+ fi
oldname=${i%.*}
nname=`echo $oldname | awk '{ split($0, a, "_"); print
a[1]"_"a[3]"@"a[2];} '`
- mv -i ${oldname}.src ${nname}.src
+ mv -f ${oldname}.src ${nname}.src
+ sed -i '' -e "s/${oldname}/${nname}/g" Makefile
+ COLLATIONS_SPECIAL=$(echo ${COLLATIONS_SPECIAL} | sed -e
"s/${oldname}/${nname}/g")
done
- sed -i '' -Ee
"s/([a-zA-Z]{2})_([a-zA-Z]+)_([a-zA-Z]{2}).([a-zA-Z0-9-]+)/\1_\3.\4@\2/g"
${old}/Makefile
# For variable without @modifier ambiguity do not keep the @modifier
for i in *@*.src; do
+ if [ "$i" = "*@*.src" ]; then
+ break
+ fi
oldname=${i%.*}
shortname=${oldname%@*}
- if [ $(ls ${shortname}@* | wc -l) -eq 1 -a ! -f ${shortname}.src ] ;
then
- mv -i $i ${shortname}.src
- sed -i '' -e "s/${oldname}/${shortname}/g" ${old}/Makefile
+ if [ $(ls ${shortname}@* | wc -l) -eq 1 ] ; then
+ mv -f $i ${shortname}.src
+ sed -i '' -e "s/${oldname}/${shortname}/g" Makefile
+ COLLATIONS_SPECIAL=$(echo ${COLLATIONS_SPECIAL} | sed -e
"s/${oldname}/${shortname}/g")
fi
done
@@ -63,16 +72,19 @@ for i in *@Latn.src; do
if [ "$i" = "*@Latn.src" ]; then
break
fi
- mv ${i} ${i%@*}@latin.src
+ mv -f ${i} ${i%@*}@latin.src
+ sed -i '' -e "s/${i%.*}/${i%@*}@latin/g" Makefile
+ COLLATIONS_SPECIAL=$(echo ${COLLATIONS_SPECIAL} | sed -e
"s/${i%.*}/${i%@*}@latin/g")
done
- sed -i '' -e "s/@Latn/@latin/g" ${old}/Makefile
+
for i in *@Cyrl.src; do
if [ "$i" = "*@Cyrl.src" ]; then
break
fi
- mv ${i} ${i%@*}@cyrillic.src
+ mv -f ${i} ${i%@*}@cyrillic.src
+ sed -i '' -e "s/${i%.*}/${i%@*}@cyrillic/g" Makefile
+ COLLATIONS_SPECIAL=$(echo ${COLLATIONS_SPECIAL} | sed -e
"s/${i%.*}/${i%@*}@cyrillic/g")
done
- sed -i '' -e "s/@Cyrl/@cyrillic/g" ${old}/Makefile
# On locales with multiple modifiers rename the "default" version without the
@modifier
default_locales="sr_RS@cyrillic"
@@ -83,8 +95,8 @@ for i in ${default_locales}; do
if [ "$l" = "${localename}.*@${mod}.src" ]; then
break
fi
- mv ${l} ${l%@*}.src
- sed -i '' -e "s/${l%.*}/${l%@*}/g" ${old}/Makefile
+ mv -f ${l} ${l%@*}.src
+ sed -i '' -e "s/${l%.*}/${l%@*}/g" Makefile
done
done
cd -
@@ -146,13 +158,12 @@ then
done
echo "" >> ${TEMP4}
for enc in ${COLLATIONS_SPECIAL}; do
- nname=`echo $enc | sed -e 's/_Hans//g'`
- sed -i '' "/^.*${nname}$/d" ${TEMP4}
- echo "LOCALES+= ${nname}" >> ${TEMP4}
+ sed -i '' "/^.*${enc}$/d" ${TEMP4}
+ echo "LOCALES+= ${enc}" >> ${TEMP4}
done
keep=$(cat ${TEMP} | awk '{ print $2 }')
- for original in ${keep}
+ for original in ${keep} ${COLLATIONS_SPECIAL}
do
cp ${old}/${original}.src ${new}/
done
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r310200 - head/tools/tools/locale
Author: bapt
Date: Sun Dec 18 04:12:45 2016
New Revision: 310200
URL: https://svnweb.freebsd.org/changeset/base/310200
Log:
In order to prepare cldr v30.0.3 and unicode 9.0.0,
more locales are removed from automatic mapping from unicode as their
encoding does not supports new characters available in unicode
Modified:
head/tools/tools/locale/Makefile
Modified: head/tools/tools/locale/Makefile
==
--- head/tools/tools/locale/MakefileSun Dec 18 04:11:13 2016
(r310199)
+++ head/tools/tools/locale/MakefileSun Dec 18 04:12:45 2016
(r310200)
@@ -31,8 +31,16 @@ COLLATION_SPECIAL?= \
nb_NO ISO8859-1 \
nb_NO ISO8859-15 \
sk_SK ISO8859-2 \
+ sr_Latn_RS ISO8859-2 \
+ sr_Cyrl_RS ISO8859-5 \
zh_Hans_CN GB2312 \
zh_Hans_CN eucCN \
+ zh_Hant_TW Big5 \
+ zh_Hans_CN GB18030 \
+ zh_Hans_CN GBK \
+ ja_JP eucJP \
+ nn_NO ISO8859-15 \
+ nn_NO ISO8859-1
.for area enc in ${COLLATION_SPECIAL}
COLLATIONS_SPECIAL_ENV+= ${area}.${enc}
@@ -91,7 +99,7 @@ build-colldef:static-colldef
static-colldef:
.for area enc in ${COLLATION_SPECIAL}
- awk -f tools/extract-colldef.awk ${CLDRDIR}/posix/${area}.${enc}.src >
colldef/${area}.${enc}.src
+ awk -f tools/extract-colldef.awk ${CLDRDIR}/posix/${area}.${enc}.src >
colldef.draft/${area}.${enc}.src
.endfor
transfer-rollup:
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r310201 - in head: share/colldef share/ctypedef share/monetdef share/msgdef share/numericdef tools/tools/locale/etc tools/tools/locale/etc/final-maps
Author: bapt Date: Sun Dec 18 04:17:13 2016 New Revision: 310201 URL: https://svnweb.freebsd.org/changeset/base/310201 Log: Update locales cldr to v30.0.3 and unicode to 9.0.0 MFC after:1 month Relnotes: yes Added: head/share/colldef/fr_CA.UTF-8.src (contents, props changed) head/share/colldef/ja_JP.eucJP.src (contents, props changed) head/share/colldef/nn_NO.ISO8859-1.src (contents, props changed) head/share/colldef/nn_NO.ISO8859-15.src (contents, props changed) head/share/colldef/nn_NO.UTF-8.src (contents, props changed) head/share/colldef/sr_RS.ISO8859-2.src (contents, props changed) head/share/colldef/sr_RS.ISO8859-5.src (contents, props changed) head/share/colldef/sr_RS.UTF-8.src (contents, props changed) head/share/colldef/sr_rs.ut...@latin.src (contents, props changed) head/share/colldef/zh_CN.GB18030.src (contents, props changed) head/share/colldef/zh_CN.GBK.src (contents, props changed) head/share/colldef/zh_TW.Big5.src (contents, props changed) head/share/ctypedef/ja_JP.eucJP.src (contents, props changed) head/share/ctypedef/zh_CN.eucCN.src (contents, props changed) head/share/monetdef/nl_BE.UTF-8.src (contents, props changed) head/tools/tools/locale/etc/final-maps/map.CP949 - copied unchanged from r303786, head/tools/tools/locale/etc/final-maps/map.eucKR Deleted: head/share/colldef/hr_HR.UTF-8.src head/share/colldef/nb_NO.UTF-8.src head/share/ctypedef/ja_JP.SJIS.src head/share/ctypedef/zh_CN.GB18030.src head/share/monetdef/be_BY.CP1251.src head/share/monetdef/lv_LV.ISO8859-13.src head/share/monetdef/lv_LV.UTF-8.src head/share/monetdef/ru_RU.CP1251.src head/share/msgdef/he_IL.UTF-8.src head/share/numericdef/hy_AM.UTF-8.src Modified: head/share/colldef/Makefile head/share/colldef/af_ZA.UTF-8.src head/share/colldef/am_ET.UTF-8.src head/share/colldef/ar_SA.UTF-8.src head/share/colldef/be_BY.UTF-8.src head/share/colldef/ca_AD.UTF-8.src head/share/colldef/cs_CZ.ISO8859-2.src head/share/colldef/cs_CZ.UTF-8.src head/share/colldef/da_DK.ISO8859-1.src head/share/colldef/da_DK.ISO8859-15.src head/share/colldef/da_DK.UTF-8.src head/share/colldef/el_GR.UTF-8.src head/share/colldef/en_US.UTF-8.src head/share/colldef/es_MX.UTF-8.src head/share/colldef/et_EE.UTF-8.src head/share/colldef/fi_FI.UTF-8.src head/share/colldef/he_IL.UTF-8.src head/share/colldef/hi_IN.UTF-8.src head/share/colldef/hr_HR.ISO8859-2.src head/share/colldef/hu_HU.ISO8859-2.src head/share/colldef/hu_HU.UTF-8.src head/share/colldef/hy_AM.UTF-8.src head/share/colldef/is_IS.UTF-8.src head/share/colldef/ja_JP.UTF-8.src head/share/colldef/kk_KZ.UTF-8.src head/share/colldef/ko_KR.UTF-8.src head/share/colldef/lt_LT.UTF-8.src head/share/colldef/lv_LV.UTF-8.src head/share/colldef/nb_NO.ISO8859-1.src head/share/colldef/nb_NO.ISO8859-15.src head/share/colldef/pl_PL.UTF-8.src head/share/colldef/ro_RO.UTF-8.src head/share/colldef/ru_RU.UTF-8.src head/share/colldef/se_NO.UTF-8.src head/share/colldef/sk_SK.ISO8859-2.src head/share/colldef/sk_SK.UTF-8.src head/share/colldef/sl_SI.UTF-8.src head/share/colldef/sv_SE.UTF-8.src head/share/colldef/tr_TR.UTF-8.src head/share/colldef/uk_UA.UTF-8.src head/share/colldef/zh_CN.GB2312.src head/share/colldef/zh_CN.UTF-8.src head/share/colldef/zh_CN.eucCN.src head/share/colldef/zh_TW.UTF-8.src head/share/ctypedef/Makefile head/share/ctypedef/be_BY.CP1131.src head/share/ctypedef/ca_IT.ISO8859-1.src head/share/ctypedef/en_US.ISO8859-1.src head/share/ctypedef/en_US.UTF-8.src head/share/ctypedef/hi_IN.ISCII-DEV.src head/share/ctypedef/uk_UA.CP1251.src head/share/monetdef/Makefile head/share/monetdef/ar_AE.UTF-8.src head/share/monetdef/ar_EG.UTF-8.src head/share/monetdef/ar_JO.UTF-8.src head/share/monetdef/ar_QA.UTF-8.src head/share/monetdef/ar_SA.UTF-8.src head/share/monetdef/be_BY.CP1131.src head/share/monetdef/be_BY.ISO8859-5.src head/share/monetdef/be_BY.UTF-8.src head/share/monetdef/bg_BG.CP1251.src head/share/monetdef/bg_BG.UTF-8.src head/share/monetdef/es_AR.UTF-8.src head/share/monetdef/es_CR.UTF-8.src head/share/monetdef/hu_HU.ISO8859-2.src head/share/monetdef/hu_HU.UTF-8.src head/share/monetdef/hy_AM.ARMSCII-8.src head/share/monetdef/hy_AM.UTF-8.src head/share/monetdef/ru_RU.CP866.src head/share/monetdef/ru_RU.ISO8859-5.src head/share/monetdef/ru_RU.KOI8-R.src head/share/monetdef/ru_RU.UTF-8.src head/share/monetdef/sl_SI.UTF-8.src head/share/monetdef/tr_TR.ISO8859-9.src head/share/monetdef/tr_TR.UTF-8.src head/share/monetdef/zh_CN.GB2312.src head/share/monetdef/zh_CN.GBK.src head/share/monetdef/zh_CN.UTF-8.src head/share/monetdef/zh_CN.eucCN.src head/share/monetdef/zh_TW.Big5.src head/share/monetdef/zh_TW.UTF-8.src head/share/msgdef/Makefile head/share/msgdef/ja_JP.SJIS.src head/share/msgdef/ja_JP.UTF-8.src head/share/msgdef/ja_JP.eucJP.src
svn commit: r310202 - head/contrib/bsnmp/lib
Author: ngie
Date: Sun Dec 18 05:31:54 2016
New Revision: 310202
URL: https://svnweb.freebsd.org/changeset/base/310202
Log:
Clean up trailing and leading whitespace
Fix variable type alignment in snmp_dialog(..)
MFC after:1 week
Modified:
head/contrib/bsnmp/lib/snmpclient.c
Modified: head/contrib/bsnmp/lib/snmpclient.c
==
--- head/contrib/bsnmp/lib/snmpclient.c Sun Dec 18 04:17:13 2016
(r310201)
+++ head/contrib/bsnmp/lib/snmpclient.c Sun Dec 18 05:31:54 2016
(r310202)
@@ -8,7 +8,7 @@
*
* Author: Harti Brandt
* Kendy Kutzner
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -17,7 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1236,23 +1236,23 @@ snmp_send_packet(struct snmp_pdu * pdu)
return (-1);
}
-pdu->request_id = snmp_next_reqid(&snmp_client);
+ pdu->request_id = snmp_next_reqid(&snmp_client);
-b.asn_ptr = buf;
-b.asn_len = snmp_client.txbuflen;
-if (snmp_pdu_encode(pdu, &b)) {
+ b.asn_ptr = buf;
+ b.asn_len = snmp_client.txbuflen;
+ if (snmp_pdu_encode(pdu, &b)) {
seterr(&snmp_client, "%s", strerror(errno));
free(buf);
return (-1);
}
-if (snmp_client.dump_pdus)
-snmp_pdu_dump(pdu);
+ if (snmp_client.dump_pdus)
+ snmp_pdu_dump(pdu);
-if ((ret = send(snmp_client.fd, buf, b.asn_ptr - buf, 0)) == -1) {
+ if ((ret = send(snmp_client.fd, buf, b.asn_ptr - buf, 0)) == -1) {
seterr(&snmp_client, "%s", strerror(errno));
free(buf);
-return (-1);
+ return (-1);
}
free(buf);
@@ -1269,7 +1269,7 @@ snmp_timeout(void * listentry_ptr)
#if 0
warnx("snmp request %i timed out, attempt (%i/%i)",
- listentry->reqid, listentry->retrycount, snmp_client.retries);
+ listentry->reqid, listentry->retrycount, snmp_client.retries);
#endif
listentry->retrycount++;
@@ -1314,7 +1314,7 @@ snmp_pdu_send(struct snmp_pdu *pdu, snmp
listentry->callback = func;
listentry->arg = arg;
listentry->retrycount=1;
- listentry->timeout_id =
+ listentry->timeout_id =
snmp_client.timeout_start(&snmp_client.timeout, snmp_timeout,
listentry);
@@ -1463,7 +1463,7 @@ snmp_receive_packet(struct snmp_pdu *pdu
return (+1);
}
-static int
+static int
snmp_deliver_packet(struct snmp_pdu * resp)
{
struct sent_pdu *listentry;
@@ -1548,7 +1548,7 @@ ok_getnext(const struct snmp_pdu * req,
&resp->bindings[i].var)) {
if (i != 0)
warnx("SNMP GETNEXT: inconsistent table "
- "response");
+ "response");
return (0);
}
if (resp->version != SNMP_V1 &&
@@ -1654,7 +1654,7 @@ ok_set(const struct snmp_pdu * req, cons
/*
* Simple checks for response PDUs against request PDUs. Return values: 1=ok,
- * 0=nosuchname or similar, -1=failure, -2=no response at all
+ * 0=nosuchname or similar, -1=failure, -2=no response at all
*/
int
snmp_pdu_check(const struct snmp_pdu *req,
@@ -1681,12 +1681,12 @@ snmp_pdu_check(const struct snmp_pdu *re
int
snmp_dialog(struct snmp_v1_pdu *req, struct snmp_v1_pdu *resp)
{
-u_int i;
-int32_t reqid;
- int ret;
-struct timeval tv = snmp_client.timeout;
+ struct timeval tv = snmp_client.timeout;
struct timeval end;
struct snmp_pdu pdu;
+ u_int i;
+ int32_t reqid;
+ int ret;
/*
* Make a copy of the request and replace the syntaxes by NULL
@@ -1698,11 +1698,11 @@ snmp_dialog(struct snmp_v1_pdu *req, str
for (i = 0; i < pdu.nbindings; i++)
pdu.bindings[i].syntax = SNMP_SYNTAX_NULL;
}
-
-for (i = 0; i <= snmp_client.retries; i++) {
+
+ for (i = 0; i <= snmp_client.retries; i++) {
(void)gettimeofday(&end, NULL);
timeradd(&end, &snmp_client.timeout, &end);
-if ((reqid = snmp_send_packet(&pdu)) == -1)
+ if ((reqid = snmp_send_packet(&pdu)) == -1)
ret
svn commit: r310203 - head/usr.sbin/bsnmpd/tools/bsnmptools
Author: ngie
Date: Sun Dec 18 05:36:04 2016
New Revision: 310203
URL: https://svnweb.freebsd.org/changeset/base/310203
Log:
Clean up parse_ip(..)
- Clean up trailing whitespace
- Fix variable alignment
MFC after:1 week
Modified:
head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
Modified: head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
==
--- head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.cSun Dec 18 05:31:54
2016(r310202)
+++ head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.cSun Dec 18 05:36:04
2016(r310203)
@@ -603,9 +603,9 @@ parse_oid_string(struct snmp_toolinfo *s
static int32_t
parse_ip(struct snmp_value * value, char * val)
{
- uint32_t v;
- int32_t i;
char *endptr, *str;
+ int32_t i;
+ uint32_t v;
str = val;
for (i = 0; i < 4; i++) {
@@ -617,8 +617,8 @@ parse_ip(struct snmp_value * value, char
str = endptr + 1;
value->v.ipaddress[i] = (uint8_t) v;
}
-
value->syntax = SNMP_SYNTAX_IPADDRESS;
+
return (0);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
