From owner-svn-src-all@freebsd.org Tue Jun 5 16:24:35 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FB84FD13A0 for ; Tue, 5 Jun 2018 16:24:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x231.google.com (mail-io0-x231.google.com [IPv6:2607:f8b0:4001:c06::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E87D828F2 for ; Tue, 5 Jun 2018 16:24:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x231.google.com with SMTP id t5-v6so4060968ioa.8 for ; Tue, 05 Jun 2018 09:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=q487qAduKosCKArIQeqQMB+4wZuzf3eAxqn5WPXB7jU=; b=tiMjg5dsNjvPkAxcJ1j8ImTnmbtQI3E/2IBGjnL6ls1HX0j8CKNixqSdlwTcCR6ZyV J9AbPI2dV2PhA3vmhbC+po8jrKjiuvnE5SNQDBGVotFIbw8jWd8Fp55K6Oljw2xX8MyX Nkl+v+BZge4GQ+EM1PL6EPHtYOidYAQI66FOj96T/ADMnmV6ifRQ2k0z6HWnYOyFnqf7 MdWQE4dNpFAlkQr78mxxa/xlANm2ZiCFJTisCipcg3Pbaza3nqRV2vUYLo09gscjUkCt Xek7QSMFSxxjwtkfEap+3in/kPBs3yjvnAwSmGLqJbUFpIvfAUG4dtCOtjV3gQKALegu DVHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=q487qAduKosCKArIQeqQMB+4wZuzf3eAxqn5WPXB7jU=; b=JqgiWdkKkhVK6SCNSKluonwSPA0BawZ97RfPNTVbsjyS/YrEUCFWgMIj6tLujS+VdN IvDIWKOhAffqFXtbRgAtoWFKxuK+mAE0RKN9LvHOk0g1IE5Wr3XB5QJ6TpwRt6bhZMnS ovhZ7ltneNJFJ0JR1Mfq1xEeHUe1JxJ7U85BjK/bwtsWEb44Bj2RsowWZsEEvqC48aL7 OqlPmVMa6G0wBBp8S/sBHcrlC/eKfv+ZvprvQtF+OZx8GTEkbJVmaAmtAXFZWck7DtWH 6jRAOk2SdgsORak+n8WoEYBTLpAAHSBezDiztkHRM56hojqLNP+hs9zb+PIjvqmkCaQr ZihA== X-Gm-Message-State: ALKqPwetOb7rAadpu8tjUuc5s2MlysSYAcCUyOWH7ln+FRbjrqdjFuDc bN7gCkr/K2yCVWzOeyPCy7c9U2cD3Z3hQrnW2Kw/VQ== X-Google-Smtp-Source: ADUXVKK+o4t2Fg9CesWDwFHllg8SAUz1TG6sF3RTtTFIw6ccGtuTGny2Lp3oj0GfYNkpReve+EotGiHklXegylglQq0= X-Received: by 2002:a6b:be01:: with SMTP id o1-v6mr25612851iof.299.1528215874275; Tue, 05 Jun 2018 09:24:34 -0700 (PDT) MIME-Version: 1.0 References: <201806051447.w55ElDIt013519@repo.freebsd.org> <20180605181822.661e5cf0@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20180605181822.661e5cf0@thor.intern.walstatt.dynvpn.de> From: Warner Losh Date: Tue, 5 Jun 2018 10:24:22 -0600 Message-ID: Subject: Re: svn commit: r334656 - head/stand/libsa To: "O. Hartmann" Cc: Ian Lepore , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.26 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 16:24:35 -0000 There is no real reason for these to be different. Especially if it causes problems... Warner On Tue, Jun 5, 2018, 10:18 AM O. Hartmann wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA512 > > Am Tue, 5 Jun 2018 14:47:13 +0000 (UTC) > Ian Lepore schrieb: > > > Author: ian > > Date: Tue Jun 5 14:47:13 2018 > > New Revision: 334656 > > URL: https://svnweb.freebsd.org/changeset/base/334656 > > > > Log: > > Add vsnprintf() to libsa. Alpha-sort the printf prototypes in stand.= h. > > > > I'm not sure why the v*printf() functions in libsa return void instea= d > of > > int, but this maintains that convention for the new function. > > > > Modified: > > head/stand/libsa/printf.c > > head/stand/libsa/stand.h > > > > Modified: head/stand/libsa/printf.c > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- head/stand/libsa/printf.c Tue Jun 5 13:53:37 2018 (r334655) > > +++ head/stand/libsa/printf.c Tue Jun 5 14:47:13 2018 (r334656) > > @@ -141,6 +141,20 @@ snprintf(char *buf, size_t size, const char *cfmt, > ... > > } > > > > void > > +vsnprintf(char *buf, size_t size, const char *cfmt, va_list ap) > > +{ > > + struct print_buf arg; > > + > > + arg.buf =3D buf; > > + arg.size =3D size; > > + > > + kvprintf(cfmt, &snprint_func, &arg, 10, ap); > > + > > + if (arg.size >=3D 1) > > + *(arg.buf)++ =3D 0; > > +} > > + > > +void > > vsprintf(char *buf, const char *cfmt, va_list ap) > > { > > int retval; > > > > Modified: head/stand/libsa/stand.h > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > --- head/stand/libsa/stand.h Tue Jun 5 13:53:37 2018 (r334655) > > +++ head/stand/libsa/stand.h Tue Jun 5 14:47:13 2018 (r334656) > > @@ -268,10 +268,11 @@ extern void *reallocf(void *ptr, size_t size)= ; > > extern void mallocstats(void); > > > > extern int printf(const char *fmt, ...) __printflike(1, 2); > > -extern void vprintf(const char *fmt, __va_list); > > extern int sprintf(char *buf, const char *cfmt, ...) __printflike(2, > 3); > > extern int snprintf(char *buf, size_t size, const char *cfmt, ...) > > __printflike(3, 4); +extern void vprintf(const char *fmt, > __va_list); > > extern void vsprintf(char *buf, const char *cfmt, __va_list); > > +extern void vsnprintf(char *buf, size_t size, const char *cfmt, > __va_list); > > > > extern void twiddle(u_int callerdiv); > > extern void twiddle_divisor(u_int globaldiv); > > _______________________________________________ > > 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-unsubscribe@freebsd.org" > > > Building world/kernel fails now with the error shown below: > > > [...] > In file included from /usr/src/stand/efi/boot1/boot1.c:34: > - --- all_subdir_share --- > - --- all_subdir_share/i18n/esdb/KAZAKH --- > =3D=3D=3D> share/i18n/esdb/KAZAKH (all) > - --- all_subdir_stand --- > /usr/src/stand/efi/boot1/boot_module.h:109:12: error: conflicting types > for 'vsnprintf' > extern int vsnprintf(char *str, size_t sz, const char *fmt, va_list ap); > ^ > /usr/src/stand/libsa/stand.h:275:13: note: previous declaration is here > extern void vsnprintf(char *buf, size_t size, const char *cfmt, > __va_list); > ^ > 1 error generated. > - --- all_subdir_rescue --- > - --- depend_subdir_rescue/rescue/routed/rtquery --- > =3D=3D=3D> rescue/rescue/routed/rtquery (depend) > - --- all_subdir_stand --- > *** [boot1.o] Error code 1 > > make[5]: stopped in /usr/src/stand/efi/boot1 > .ERROR_TARGET=3D'boot1.o' > > .ERROR_META_FILE=3D'/usr/obj/usr/src/amd64.amd64/stand/efi/boot1/boot1.o.= meta' > .MAKE.LEVEL=3D'5' > MAKEFILE=3D'' > .MAKE.MODE=3D'meta missing-filemon=3Dyes missing-meta=3Dyes silent=3Dyes = verbose' > _ERROR_CMD=3D'cc -target x86_64-unknown-freebsd12.0 > - --sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp > -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin > - -O2 -pipe -O3 -march=3Dnative -Wformat -fshort-wchar -mno-red-zone > -nostdinc > - -I/usr/obj/usr/src/amd64.amd64/stand/libsa -I/usr/src/stand/libsa > -D_STANDALONE > - -I/usr/src/sys -Ddouble=3Djagged-little-pill -Dfloat=3Dfloaty-mcfloatfa= ce > - -DLOADER_DISK_SUPPORT -ffreestanding -mno-mmx -mno-sse -mno-avx > -mno-avx2 -msoft-float > - -fPIC -mno-red-zone -I. -DEFI_ZFS_BOOT -I/usr/src/stand/efi/include > - -I/usr/src/stand/efi/include/amd64 > -I/usr/src/sys/contrib/dev/acpica/include > - -DEFI_UFS_BOOT -I/usr/src/stand/common -fPIC -DNDEBUG -std=3Dgnu99 > -Wsystem-headers > - -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int > -Wno-unused-const-variable > - -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality > - -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef > - -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum > -Wno-knr-promoted-parameter > - -Wno-parentheses -Wno-format -Qunused-arguments -c > /usr/src/stand/efi/boot1/boot1.c -o > boot1.o; ;' > > ... > > > Sources are at revision 334664. > > Kind regards, > > oh > - -- > O. Hartmann > > Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr > Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Ab= s. 4 BDSG). > -----BEGIN PGP SIGNATURE----- > > iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWxa3zgAKCRDS528fyFhY > lHBLAgCP69VupKSyww77gfghKUBS6eoR6jf6OmvMGWOnxemWBS/BAYwiGCK+ZFmk > 3ur207rjRoqR/C/jF4ywA2ddQQ5UAgCZ7QxcQD4HClKIn3Mw+W0QvuvXPLv/TBjN > VnvRfwQfKnXUfjNmlmXrHvDTaHS1R7RtTUvQxK5L5PcAmOuPQhRj > =3DYisO > -----END PGP SIGNATURE----- >