From owner-svn-src-head@freebsd.org Sun Aug 28 07:40:36 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7593EB783AB; Sun, 28 Aug 2016 07:40:36 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) (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 081D778B; Sun, 28 Aug 2016 07:40:36 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-wm0-x22c.google.com with SMTP id q128so40817913wma.1; Sun, 28 Aug 2016 00:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=ALmXfGB/ARK37NGGT03Ls7PwdivTwz0lxwIJjU/iuY8=; b=jdqgXX1hm06FQJyDTvlsQhKpIlnrpl3lbNgfyBNSBlCPyuY28/Z1LejY4R3Vwj3LUr 7SDEMOP7oIcaqKaTpr7NW+IXE/+3px7G446L5+uzdPB0wYu70XLwL7noGcokBbh/mgMW avaZxjkEBDaP+2lQL1inCKfv3SPZB2NGonCyodpnMqlo7GNX6oNoyoV+mMs9xpyaG+LZ qxK11fjwKXLLbuTVKnX4NVm0HL3bfID1ii3rYVyAaVciXOvbcarDKssKq+0CGXfZASl1 aD/I0j6ITMa4L5H0Q5U2dX6bGt6JbBme1TqwXXkS7oDj8FNzJnOKuI172v/SY/1ylw30 zxGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=ALmXfGB/ARK37NGGT03Ls7PwdivTwz0lxwIJjU/iuY8=; b=X5ysnWxe0wv/ayttl2+bN8NcUHh5x47gPuoBGjD3Z9FZ7qw9Muv7tIgg9cScHSPySi 4GzUVIxrD5JDCjvW8qRpDUxJxNy62oIGNdfO/JhHoE/dnBUk4jETNNKK5dDJaSF6JNxS DDBwjRlQOQNGYU4xl0HHcKjk7LD0QFsh1/g4wDHF8hLLXmqOtR+gJj3Jmo72vAdfu0xh z2znsSvspZkr7rcX0J9EJzKiw4Y9yVI8qvLQtVte1rrR2oroNhasCow2rR7+wzxK47sn hiiLpf9ODm2vXzc0ueVPOFTyIb5tmTojVU8ZH51yLYw4O9zJpZEKqcGaC4jes64Dxsmm HtVw== X-Gm-Message-State: AE9vXwMdH+adB/YeDusDg60xyp4gU+rdH9hG/Oex5/N2xqd5L6ERv7s/GvOeLN0U12HQeCaO2yGn20v0XVKtqA== X-Received: by 10.28.238.88 with SMTP id m85mr5292744wmh.92.1472370034345; Sun, 28 Aug 2016 00:40:34 -0700 (PDT) MIME-Version: 1.0 Sender: oshogbo.vx@gmail.com Received: by 10.28.158.193 with HTTP; Sun, 28 Aug 2016 00:40:33 -0700 (PDT) In-Reply-To: References: <201608271522.u7RFMtBY006582@repo.freebsd.org> From: Mariusz Zaborski Date: Sun, 28 Aug 2016 09:40:33 +0200 X-Google-Sender-Auth: QYQA9T4oLoWojQvFww1rCD_oI0I Message-ID: Subject: Re: svn commit: r304912 - head/sys/sys To: Adrian Chadd Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2016 07:40:36 -0000 Eh, sorry. Fixed in the @304952. On 28 August 2016 at 06:17, Adrian Chadd wrote: > ... > > ===> lib/libnv (obj,all,install) > In file included from > /usr/home/adrian/work/freebsd/head-embedded/src/lib/libnv/../../sys/contrib/libnv/cnvlist.c:49:0: > /usr/home/adrian/work/freebsd/head-embedded/src/lib/libnv/../../sys/sys/cnv.h:107:6: > error: redundant redeclaration of 'cnvlist_free_descriptor' > [-Werror=redundant-decls] > void cnvlist_free_descriptor(nvlist_t *nvl, void *cookiep); > ^ > /usr/home/adrian/work/freebsd/head-embedded/src/lib/libnv/../../sys/sys/cnv.h:101:6: > note: previous declaration of 'cnvlist_free_descriptor' was here > void cnvlist_free_descriptor(nvlist_t *nvl, void *cookiep); > ^ > cc1: all warnings being treated as errors > --- cnvlist.o --- > *** [cnvlist.o] Error code 1 > > make[4]: stopped in /usr/home/adrian/work/freebsd/head-embedded/src/lib/libnv > 1 error > > > > -a > > > On 27 August 2016 at 08:22, Mariusz Zaborski wrote: >> Author: oshogbo >> Date: Sat Aug 27 15:22:55 2016 >> New Revision: 304912 >> URL: https://svnweb.freebsd.org/changeset/base/304912 >> >> Log: >> Add missed header file for cnv.h . >> >> Submitted by: Adam Starak >> Reported by: ache@ >> >> Added: >> head/sys/sys/cnv.h (contents, props changed) >> >> Added: head/sys/sys/cnv.h >> ============================================================================== >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ head/sys/sys/cnv.h Sat Aug 27 15:22:55 2016 (r304912) >> @@ -0,0 +1,113 @@ >> +/*- >> + * Copyright (c) 2016 Adam Starak >> + * All rights reserved. >> + * >> + * Redistribution and use in source and binary forms, with or without >> + * modification, are permitted provided that the following conditions >> + * are met: >> + * 1. Redistributions of source code must retain the above copyright >> + * notice, this list of conditions and the following disclaimer. >> + * 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 THE AUTHORS 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 >> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE >> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL >> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS >> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT >> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY >> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> + * SUCH DAMAGE. >> + * >> + * $FreeBSD$ >> + */ >> + >> +#ifndef _CNV_H_ >> +#define _CNV_H_ >> + >> +#include >> + >> +#ifndef _KERNEL >> +#include >> +#include >> +#include >> +#include >> +#endif >> + >> +#ifndef _NVLIST_T_DECLARED >> +#define _NVLIST_T_DECLARED >> +struct nvlist; >> + >> +typedef struct nvlist nvlist_t; >> +#endif >> + >> +__BEGIN_DECLS >> + >> +/* >> + * The cnvlist_get functions returns value associated with the given cookie. >> + * If it returns a pointer, the pointer represents internal buffer and should >> + * not be freed by the caller. >> + */ >> + >> +bool cnvlist_get_bool(void *cookiep); >> +uint64_t cnvlist_get_number(void *cookiep); >> +const char *cnvlist_get_string(void *cookiep); >> +const nvlist_t *cnvlist_get_nvlist(void *cookiep); >> +const void *cnvlist_get_binary(void *cookiep, size_t *sizep); >> +const bool *cnvlist_get_bool_array(void *cookiep, size_t *nitemsp); >> +const uint64_t *cnvlist_get_number_array(void *cookiep, size_t *nitemsp); >> +const char * const *cnvlist_get_string_array(void *cookiep, size_t *nitemsp); >> +const nvlist_t * const *cnvlist_get_nvlist_array(void *cookiep, size_t *nitemsp); >> +#ifndef _KERNEL >> +int cnvlist_get_descriptor(void *cookiep); >> +const int *cnvlist_get_descriptor_array(void *cookiep, size_t *nitemsp); >> +#endif >> + >> + >> +/* >> + * The cnvlist_take functions returns value associated with the given cookie and >> + * remove the given entry from the nvlist. >> + * The caller is responsible for freeing received data. >> + */ >> + >> +bool cnvlist_take_bool(nvlist_t *nvl, void *cookiep); >> +uint64_t cnvlist_take_number(nvlist_t *nvl, void *cookiep); >> +char *cnvlist_take_string(nvlist_t *nvl, void *cookiep); >> +nvlist_t *cnvlist_take_nvlist(nvlist_t *nvl, void *cookiep); >> +void *cnvlist_take_binary(nvlist_t *nvl, void *cookiep, size_t *sizep); >> +bool *cnvlist_take_bool_array(nvlist_t *nvl, void *cookiep, size_t *nitemsp); >> +uint64_t *cnvlist_take_number_array(nvlist_t *nvl, void *cookiep, size_t *nitemsp); >> +char **cnvlist_take_string_array(nvlist_t *nvl, void *cookiep, size_t *nitemsp); >> +nvlist_t **cnvlist_take_nvlist_array(nvlist_t *nvl, void *cookiep, size_t *nitemsp); >> +#ifndef _KERNEL >> +int cnvlist_take_descriptor(nvlist_t *nvl, void *cookiep); >> +int *cnvlist_take_descriptor_array(nvlist_t *nvl, void *cookiep, size_t *nitemsp); >> +#endif >> + >> +/* >> + * The cnvlist_free functions removes the given name/value pair from the nvlist based on cookie >> + * and frees memory associated with it. >> + */ >> + >> +void cnvlist_free_bool(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_number(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_string(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_nvlist(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_binary(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_descriptor(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_bool_array(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_number_array(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_string_array(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_nvlist_array(nvlist_t *nvl, void *cookiep); >> +#ifndef _KERNEL >> +void cnvlist_free_descriptor(nvlist_t *nvl, void *cookiep); >> +void cnvlist_free_descriptor_array(nvlist_t *nvl, void *cookiep); >> +#endif >> + >> +__END_DECLS >> + >> +#endif /* !_CNV_H_ */ >>