[svn-commits] mjordan: trunk r421676 - in /trunk: ./ include/asterisk/uri.h main/uri.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Aug 21 09:42:12 2014
New Revision: 421676

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=421676
Log:
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

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/uri.h
    trunk/main/uri.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/include/asterisk/uri.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/uri.h?view=diff&rev=421676&r1=421675&r2=421676
==============================================================================
--- trunk/include/asterisk/uri.h (original)
+++ trunk/include/asterisk/uri.h Thu Aug 21 09:42:12 2014
@@ -115,7 +115,7 @@
  * \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.

Modified: trunk/main/uri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/uri.c?view=diff&rev=421676&r1=421675&r2=421676
==============================================================================
--- trunk/main/uri.c (original)
+++ trunk/main/uri.c Thu Aug 21 09:42:12 2014
@@ -142,7 +142,7 @@
 	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';