From nobody Sun Feb 12 12:17:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PF6175XnMz3pHL9; Sun, 12 Feb 2023 12:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PF617523Zz44Lp; Sun, 12 Feb 2023 12:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676204251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtP0TvAiVBelVr9Mdp4dqwLMPXonMiZE7weX5J6o6WE=; b=SLhLbgRwbYbddKL0szvGKrwjpvZ5OvYNM0yPiCELyZ7za3oIeIOkSBDHdrHqWJwNsJtPfP B+O2KJDJ+BVEoDZL0IYI0FA8KoVMfX1xA5DXNFwP6RCz3W51NQefzHbJOHsECZk/kbx62n 4q8eXyumbRytqnmGdqyY4vo/EMD/+FNnaCuXLISgOCKM1hcH6xg1cQioOwvzP+bAIQ/GCc RBY33xg0H3Hi0zl+UCZo6t4+4nufc/ZipGvI5+DXVfmu1Lp4fiRKM5cZVgVaRN3I7+howh HwFDUABYHpu1zevdBqZJwOdqeKmk4J19QsybY5OHcPZ/93WuXBSOLm0giHhXxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676204251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtP0TvAiVBelVr9Mdp4dqwLMPXonMiZE7weX5J6o6WE=; b=ao69rjId9mDfDrwb18/WJ8kFuOYegO6muZA0cAJMe5YKAkPjpq6TKbz4ba3eXcMPR2hf1U Pa7iIkYBR8q3mR/ckF+U67rwVbq7Sf3XtmKkS2LJH/xnsE3OwnjA/5EYp6JN1fhqFBop+t 8Kza8LTvfHmyWltLyt4laX0kE44uasA8gf/XDptsIOL+hTyuDu5coM+k+0AW9hxMY8YQXI TPKybHekCIGsaUIq7ZSZ5nFJzgj5IHBGsI0V+KUSkrdhTP6dDg++bR2YLkK8ZKgm+d+AX1 kj9uFJpDvsZEendVbToBspkTWsa7l9frZQMs9/fXCI+9UdIKNHzDVUv51Btg8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676204251; a=rsa-sha256; cv=none; b=Z31GFr8S/XAyWPnhpWajdBGUEVGIgbsYKE2L/80LelaZeZSfg1+ysWX7x4+Lq/vQGESoJD Z1y3kYHS+vD1xFbiNS11dLzgob+30CzWLoyLG4g/Y6rq01gHvDaw8FgwoHIROiIZLZdhHT QLakimMqtXueAOzLavbZQmHH5fZ7VY8V+XxIw0aZvMjyD0e1RoQi4G8RaMz33/UwbW71Z6 2+muLxDVTG/ZYkT3zwpULd4/5buSwXoZe8edPAWSsGQJixzyAfMz2skGneCSR5QoQntkB5 uFLx/QXvNGz7+uEvcKJbJSiGYmrB/OxNiNVJG/qow49NTi1J7krOnk4PC1uG6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PF617450jzdtf; Sun, 12 Feb 2023 12:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31CCHVTD039900; Sun, 12 Feb 2023 12:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CCHVof039899; Sun, 12 Feb 2023 12:17:31 GMT (envelope-from git) Date: Sun, 12 Feb 2023 12:17:31 GMT Message-Id: <202302121217.31CCHVof039899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 6d7da7c8490f - main - Revert "netlink: make netlink_snl(3) c++ friendly." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d7da7c8490f625642faad93b890354cc749f5ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=6d7da7c8490f625642faad93b890354cc749f5ae commit 6d7da7c8490f625642faad93b890354cc749f5ae Author: Alexander V. Chernikov AuthorDate: 2023-02-12 12:16:58 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-12 12:17:05 +0000 Revert "netlink: make netlink_snl(3) c++ friendly." Was pushed accidentally. This reverts commit 629d9219d931e63dc49ef046332b2a360e42a5f6. --- sys/netlink/netlink_snl.h | 22 +++++++++------------- sys/netlink/netlink_snl_route.h | 6 +----- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 586cab391046..6e2c4b89a7c4 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -44,7 +44,6 @@ #include #include -__BEGIN_DECLS #define _roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) @@ -84,7 +83,7 @@ lb_allocz(struct linear_buffer *lb, int len) return (NULL); void *data = (void *)(lb->base + lb->offset); lb->offset += len; - return ((char *)data); + return (data); } static inline void @@ -133,10 +132,10 @@ struct snl_hdr_parser { #define SNL_DECLARE_PARSER(_name, _t, _fp, _np) \ static const struct snl_hdr_parser _name = { \ .hdr_off = sizeof(_t), \ - .fp_size = NL_ARRAY_LEN(_fp), \ - .np_size = NL_ARRAY_LEN(_np), \ .fp = &((_fp)[0]), \ .np = &((_np)[0]), \ + .fp_size = NL_ARRAY_LEN(_fp), \ + .np_size = NL_ARRAY_LEN(_np), \ } #define SNL_DECLARE_ATTR_PARSER(_name, _np) \ @@ -176,14 +175,14 @@ snl_init(struct snl_state *ss, int netlink_family) } ss->bufsize = rcvbuf; - ss->buf = (char *)malloc(ss->bufsize); + ss->buf = malloc(ss->bufsize); if (ss->buf == NULL) { snl_free(ss); return (false); } ss->lb.size = SCRATCH_BUFFER_SIZE; - ss->lb.base = (char *)calloc(1, ss->lb.size); + ss->lb.base = calloc(1, ss->lb.size); if (ss->lb.base == NULL) { snl_free(ss); return (false); @@ -361,7 +360,7 @@ snl_attr_get_uint16(struct snl_state *ss __unused, struct nlattr *nla, const void *arg __unused, void *target) { if (NLA_DATA_LEN(nla) == sizeof(uint16_t)) { - *((uint16_t *)target) = *((const uint16_t *)NL_RTA_DATA_CONST(nla)); + *((uint16_t *)target) = *((const uint16_t *)NLA_DATA_CONST(nla)); return (true); } return (false); @@ -372,7 +371,7 @@ snl_attr_get_uint32(struct snl_state *ss __unused, struct nlattr *nla, const void *arg __unused, void *target) { if (NLA_DATA_LEN(nla) == sizeof(uint32_t)) { - *((uint32_t *)target) = *((const uint32_t *)NL_RTA_DATA_CONST(nla)); + *((uint32_t *)target) = *((const uint32_t *)NLA_DATA_CONST(nla)); return (true); } return (false); @@ -397,7 +396,7 @@ snl_attr_get_stringn(struct snl_state *ss, struct nlattr *nla, { int maxlen = NLA_DATA_LEN(nla); - char *buf = (char *)snl_allocz(ss, maxlen + 1); + char *buf = snl_allocz(ss, maxlen + 1); if (buf == NULL) return (false); buf[maxlen] = '\0'; @@ -417,8 +416,7 @@ snl_attr_get_nested(struct snl_state *ss, struct nlattr *nla, const void *arg, v } static inline bool -snl_attr_get_nla(struct snl_state *ss __unused, struct nlattr *nla, - const void *arg __unused, void *target) +snl_attr_get_nla(struct snl_state *ss __unused, struct nlattr *nla, void *target) { *((struct nlattr **)target) = nla; return (true); @@ -442,6 +440,4 @@ snl_field_get_uint32(struct snl_state *ss __unused, void *src, void *target) *((uint32_t *)target) = *((uint32_t *)src); } -__END_DECLS - #endif diff --git a/sys/netlink/netlink_snl_route.h b/sys/netlink/netlink_snl_route.h index 19841bdd2f50..4adb3d697ecd 100644 --- a/sys/netlink/netlink_snl_route.h +++ b/sys/netlink/netlink_snl_route.h @@ -31,8 +31,6 @@ #include #include -__BEGIN_DECLS - /* * Simple Netlink Library - NETLINK_ROUTE helpers */ @@ -102,7 +100,7 @@ snl_attr_get_ip(struct snl_state *ss, struct nlattr *nla, static inline struct sockaddr * parse_rta_via(struct snl_state *ss, struct rtattr *rta, int *perror) { - struct rtvia *via = (struct rtvia *)NL_RTA_DATA(rta); + struct rtvia *via = NL_RTA_DATA(rta); switch (via->rtvia_family) { case AF_INET: @@ -129,6 +127,4 @@ snl_attr_get_ipvia(struct snl_state *ss, struct nlattr *nla, return (false); } -__END_DECLS - #endif