From 94a797bcafb469d743ca36b153e01eb093efebf4 Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 20 Aug 2019 18:20:42 +0200 Subject: issue #7212 1.8.16: Function returning void pointer generates warning Have to see that the argument is not a void pointer but just a void --- src/memberdef.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 9d6ac51..1e03288 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -4201,19 +4201,19 @@ void MemberDefImpl::detectUndocumentedParams(bool hasParamCommand,bool hasReturn else if ( // see if return type is documented in a function w/o return type hasReturnCommand && ( - returnType.find("void")!=-1 || // void return type + (returnType.find("void")!=-1 && returnType.find('*')==-1) || // void return type returnType.find("subroutine")!=-1 || // fortran subroutine isConstructor() || // a constructor isDestructor() // or destructor ) ) { - warn_doc_error(getDefFileName(),getDefLine(),"documented empty return type of %s", + warn_doc_error(getDefFileName(),getDefLine(),"documented empty return type of %s", qualifiedName().data()); } else if ( // see if return needs to documented m_impl->hasDocumentedReturnType || - returnType.find("void")!=-1 || // void return type + (returnType.find("void")!=-1 && returnType.find('*')==-1) || // void return type returnType.find("subroutine")!=-1 || // fortran subroutine isConstructor() || // a constructor isDestructor() // or destructor -- cgit v0.12 From 361f3e10a86370a568733a7e4d862b180cf45fd9 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 31 Aug 2019 13:05:46 +0200 Subject: Made check for void return more strict --- src/memberdef.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/memberdef.cpp b/src/memberdef.cpp index d79b37e..4f44baa 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -4201,25 +4201,25 @@ void MemberDefImpl::detectUndocumentedParams(bool hasParamCommand,bool hasReturn m_impl->hasDocumentedReturnType = TRUE; } else if ( // see if return type is documented in a function w/o return type - hasReturnCommand && - ( - (returnType.find("void")!=-1 && returnType.find('*')==-1) || // void return type - returnType.find("subroutine")!=-1 || // fortran subroutine - isConstructor() || // a constructor - isDestructor() // or destructor - ) - ) + hasReturnCommand && + ( + returnType=="void" || // void return type + returnType.find("subroutine")!=-1 || // fortran subroutine + isConstructor() || // a constructor + isDestructor() // or destructor + ) + ) { warn_doc_error(getDefFileName(),getDefLine(),"documented empty return type of %s", qualifiedName().data()); } else if ( // see if return needs to documented - m_impl->hasDocumentedReturnType || - (returnType.find("void")!=-1 && returnType.find('*')==-1) || // void return type - returnType.find("subroutine")!=-1 || // fortran subroutine - isConstructor() || // a constructor - isDestructor() // or destructor - ) + m_impl->hasDocumentedReturnType || + returnType=="void" || // void return type + returnType.find("subroutine")!=-1 || // fortran subroutine + isConstructor() || // a constructor + isDestructor() // or destructor + ) { m_impl->hasDocumentedReturnType = TRUE; } -- cgit v0.12