uri: Quiet warning about type qualifiers ignored on function return type

This patch fixes gcc warnings that occur due to the type qualifier 'const'
being ignored on a return type of int.

ASTERISK-24246 #close
Reported by: Shaun Ruffell
patches:
  0001-main-uri-Quiet-warning-about-ignored-attribute-on-re.patch uploaded by Shaun Ruffell (License 5417)
........

Merged revisions 421675 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@421676 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/uri.h b/include/asterisk/uri.h
index 225d8c8d7f9bff010df8c2336b7de8eef778981e..f5f70a50bba79f84b1223950a75bf4ece4452933 100644 (file)
--- a/include/asterisk/uri.h
+++ b/include/asterisk/uri.h
@@ -115,7 +115,7 @@ const char *ast_uri_query(const struct ast_uri *uri);
  * \return True if secure, False otherwise.
  * \since 13
  */
-const int ast_uri_is_secure(const struct ast_uri *uri);
+int attribute_pure ast_uri_is_secure(const struct ast_uri *uri);
 
 /*!
  * \brief Parse the given uri into a structure.

diff --git a/main/uri.c b/main/uri.c
index be1136fe67819bb1faa3de27451170af126d19d5..07493699bbfe8a4ae0b8948a408d7a90bf195d88 100644 (file)
--- a/main/uri.c
+++ b/main/uri.c
@@ -142,7 +142,7 @@ const char *ast_uri_query(const struct ast_uri *uri)
        return uri->query;
 }
 
-const int ast_uri_is_secure(const struct ast_uri *uri)
+int ast_uri_is_secure(const struct ast_uri *uri)
 {
        return ast_strlen_zero(uri->scheme) ? 0 :
                *(uri->scheme + strlen(uri->scheme) - 1) == 's';