From owner-svn-ports-all@freebsd.org Sun Jun 17 19:06:52 2018 Return-Path: Delivered-To: svn-ports-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 704C010062DD; Sun, 17 Jun 2018 19:06:52 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 21C7E7A579; Sun, 17 Jun 2018 19:06:52 +0000 (UTC) (envelope-from tobik@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 0440219650; Sun, 17 Jun 2018 19:06:52 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5HJ6ph9074953; Sun, 17 Jun 2018 19:06:51 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5HJ6ppI074952; Sun, 17 Jun 2018 19:06:51 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201806171906.w5HJ6ppI074952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 17 Jun 2018 19:06:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472627 - in head/databases/dbtool: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/databases/dbtool: . files X-SVN-Commit-Revision: 472627 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jun 2018 19:06:52 -0000 Author: tobik Date: Sun Jun 17 19:06:51 2018 New Revision: 472627 URL: https://svnweb.freebsd.org/changeset/ports/472627 Log: databases/dbtool: Unbreak with Clang 6 engine.cc:539:46: error: non-constant-expression cannot be narrowed from type 'std::__1::basic_string, std::__1::allocator >::size_type' (aka 'unsigned long') to 'int' in initializer list [-Wc++11-narrowing] datum key = {(char *)config.key.c_str(), config.key.length()}; ^~~~~~~~~~~~~~~~~~~ engine.cc:539:46: note: insert an explicit cast to silence this issue datum key = {(char *)config.key.c_str(), config.key.length()}; ^~~~~~~~~~~~~~~~~~~ static_cast( ) http://beefy12.nyi.freebsd.org/data/head-amd64-default/p472224_s334983/logs/dbtool-1.9.1.log Added: head/databases/dbtool/files/ head/databases/dbtool/files/patch-engine.cc (contents, props changed) Modified: head/databases/dbtool/Makefile Modified: head/databases/dbtool/Makefile ============================================================================== --- head/databases/dbtool/Makefile Sun Jun 17 18:52:54 2018 (r472626) +++ head/databases/dbtool/Makefile Sun Jun 17 19:06:51 2018 (r472627) @@ -14,13 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre -USES= gmake shebangfix +USES= gmake localbase shebangfix SHEBANG_FILES= samples/account-db/accdb bash_OLD_CMD= /bin/sh GNU_CONFIGURE= yes - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib PORTEXAMPLES= * PLIST_FILES= bin/dbtool man/man1/dbtool.1.gz Added: head/databases/dbtool/files/patch-engine.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/dbtool/files/patch-engine.cc Sun Jun 17 19:06:51 2018 (r472627) @@ -0,0 +1,64 @@ +engine.cc:539:46: error: non-constant-expression cannot be narrowed from type + 'std::__1::basic_string, + std::__1::allocator >::size_type' (aka 'unsigned long') to 'int' in + initializer list [-Wc++11-narrowing] + datum key = {(char *)config.key.c_str(), config.key.length()}; + ^~~~~~~~~~~~~~~~~~~ +engine.cc:539:46: note: insert an explicit cast to silence this issue + datum key = {(char *)config.key.c_str(), config.key.length()}; + ^~~~~~~~~~~~~~~~~~~ + static_cast( ) + +--- engine.cc.orig 2018-06-17 15:07:26 UTC ++++ engine.cc +@@ -324,8 +324,8 @@ void Engine::from_input() { + Dbt d_key((char *)key.c_str(), key.length()); + Dbt d_value((char *)value.c_str(), value.length()); + #else +- datum d_key = {(char *)key.c_str(), key.length()}; +- datum d_value = {(char *)value.c_str(), value.length()}; ++ datum d_key = {(char *)key.c_str(), static_cast(key.length())}; ++ datum d_value = {(char *)value.c_str(), static_cast(value.length())}; + #endif + if(config.force == 1) { + #ifdef HAVE_BERKELEY +@@ -405,8 +405,8 @@ void Engine::insert() { + Dbt value(v, strlen(v)); + #else + int ret; +- datum key = {(char *)config.key.c_str(), config.key.length()}; +- datum value = {(char *)__value.c_str(), __value.length()}; ++ datum key = {(char *)config.key.c_str(), static_cast(config.key.length())}; ++ datum value = {(char *)__value.c_str(), static_cast(__value.length())}; + #endif + + if(config.force == 1) { +@@ -465,8 +465,8 @@ void Engine::update() { + Dbt value(v, strlen(v)); + #else + int ret; +- datum key = {(char *)config.key.c_str(), config.key.length()}; +- datum value = {(char *)__value.c_str(), __value.length()}; ++ datum key = {(char *)config.key.c_str(), static_cast(config.key.length())}; ++ datum value = {(char *)__value.c_str(), static_cast(__value.length())}; + #endif + + if(config.force == 1) { +@@ -536,7 +536,7 @@ void Engine::remove() { + } + db->close(0); + #else +- datum key = {(char *)config.key.c_str(), config.key.length()}; ++ datum key = {(char *)config.key.c_str(), static_cast(config.key.length())}; + ret = gdbm_delete(db, key); + gdbm_close(db); + #endif +@@ -579,7 +579,7 @@ void Engine::select() { + db->close(0); + #else + datum content; +- datum key = {(char *)config.key.c_str(), config.key.length()}; ++ datum key = {(char *)config.key.c_str(), static_cast(config.key.length())}; + content = gdbm_fetch(db, key); + string V(content.dptr, content.dsize); + if(config.with == 1)