sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

databases/dbtool: Unbreak with Clang 6

Browse source 
engine.cc:539:46: error: non-constant-expression cannot be narrowed from type
      'std::__1::basic_string<char, std::__1::char_traits<char>,
      std::__1::allocator<char> >::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<int>(  )

http://beefy12.nyi.freebsd.org/data/head-amd64-default/p472224_s334983/logs/dbtool-1.9.1.log
This commit is contained in:
Tobias Kortkamp 2018-06-17 19:06:51 +00:00
parent 63b1f04492
commit fd4528a7ce
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=472627
2 changed files with 65 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
databases/dbtool/Makefile
View file

@ -14,14 +14,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpcre.so:devel/pcre LIB_DEPENDS= libpcre.so:devel/pcre
USES= gmake shebangfix USES= gmake localbase shebangfix
SHEBANG_FILES= samples/account-db/accdb SHEBANG_FILES= samples/account-db/accdb
bash_OLD_CMD= /bin/sh bash_OLD_CMD= /bin/sh
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PORTEXAMPLES= * PORTEXAMPLES= *
PLIST_FILES= bin/dbtool man/man1/dbtool.1.gz PLIST_FILES= bin/dbtool man/man1/dbtool.1.gz

64
databases/dbtool/files/patch-engine.cc Normal file
View file

@ -0,0 +1,64 @@
engine.cc:539:46: error: non-constant-expression cannot be narrowed from type
'std::__1::basic_string<char, std::__1::char_traits<char>,
std::__1::allocator<char> >::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<int>( )
--- 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<int>(key.length())};
+ datum d_value = {(char *)value.c_str(), static_cast<int>(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<int>(config.key.length())};
+ datum value = {(char *)__value.c_str(), static_cast<int>(__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<int>(config.key.length())};
+ datum value = {(char *)__value.c_str(), static_cast<int>(__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<int>(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<int>(config.key.length())};
content = gdbm_fetch(db, key);
string V(content.dptr, content.dsize);
if(config.with == 1)