From owner-svn-src-head@freebsd.org Wed Nov 4 17:51:10 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5731C462A6E; Wed, 4 Nov 2020 17:51:10 +0000 (UTC) (envelope-from dim@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CRDjB1cMFz446S; Wed, 4 Nov 2020 17:51:10 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A7211133B; Wed, 4 Nov 2020 17:51:10 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A4Hp9c8048128; Wed, 4 Nov 2020 17:51:09 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A4Hp9mc048127; Wed, 4 Nov 2020 17:51:09 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202011041751.0A4Hp9mc048127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 4 Nov 2020 17:51:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367337 - head/contrib/libcxxrt X-SVN-Group: head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: head/contrib/libcxxrt X-SVN-Commit-Revision: 367337 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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: Wed, 04 Nov 2020 17:51:10 -0000 Author: dim Date: Wed Nov 4 17:51:09 2020 New Revision: 367337 URL: https://svnweb.freebsd.org/changeset/base/367337 Log: Make vector-related functions in libcxxrt's demangler static Follow-up to r367323 by re-adding static to a number of the functions copied from elftc's libelftc_vstr.c. This was requested by upstream. PR: 250702 MFC after: 3 days Modified: head/contrib/libcxxrt/libelftc_dem_gnu3.c Modified: head/contrib/libcxxrt/libelftc_dem_gnu3.c ============================================================================== --- head/contrib/libcxxrt/libelftc_dem_gnu3.c Wed Nov 4 17:22:12 2020 (r367336) +++ head/contrib/libcxxrt/libelftc_dem_gnu3.c Wed Nov 4 17:51:09 2020 (r367337) @@ -153,7 +153,7 @@ get_strlen_sum(const struct vector_str *v) /** * @brief Deallocate resource in vector_str. */ -void +static void vector_str_dest(struct vector_str *v) { size_t i; @@ -174,7 +174,7 @@ vector_str_dest(struct vector_str *v) * @param l Length of the string. * @return -1 at failed, 0 at not found, 1 at found. */ -int +static int vector_str_find(const struct vector_str *v, const char *o, size_t l) { size_t i; @@ -197,7 +197,7 @@ vector_str_find(const struct vector_str *v, const char * @param l Length of the string. * @return NULL at failed or NUL terminated new allocated string. */ -char * +static char * vector_str_get_flat(const struct vector_str *v, size_t *l) { ssize_t elem_pos, elem_size, rtn_size; @@ -263,7 +263,7 @@ vector_str_grow(struct vector_str *v) * @brief Initialize vector_str. * @return false at failed, true at success. */ -bool +static bool vector_str_init(struct vector_str *v) { @@ -287,7 +287,7 @@ vector_str_init(struct vector_str *v) * @brief Remove last element in vector_str. * @return false at failed, true at success. */ -bool +static bool vector_str_pop(struct vector_str *v) { @@ -309,7 +309,7 @@ vector_str_pop(struct vector_str *v) * @brief Push back string to vector. * @return false at failed, true at success. */ -bool +static bool vector_str_push(struct vector_str *v, const char *str, size_t len) { @@ -333,7 +333,7 @@ vector_str_push(struct vector_str *v, const char *str, * @brief Push front org vector to det vector. * @return false at failed, true at success. */ -bool +static bool vector_str_push_vector_head(struct vector_str *dst, struct vector_str *org) { size_t i, j, tmp_cap; @@ -373,7 +373,7 @@ vector_str_push_vector_head(struct vector_str *dst, st * @brief Push org vector to the tail of det vector. * @return false at failed, true at success. */ -bool +static bool vector_str_push_vector(struct vector_str *dst, struct vector_str *org) { size_t i, j, tmp_cap; @@ -416,7 +416,7 @@ vector_str_push_vector(struct vector_str *dst, struct * If r_len is not NULL, string length will be returned. * @return NULL at failed or NUL terminated new allocated string. */ -char * +static char * vector_str_substr(const struct vector_str *v, size_t begin, size_t end, size_t *r_len) {