kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix some doxygen and curly placement." into 13

Browse Source
This commit is contained in:
Kevin Harwell
2018-06-20 17:15:35 -05:00
committed by Gerrit Code Review
parent 8cc080a95c 7b30158147
commit e7ffbbd40e
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/asterisk/utils.h
View File

@@ -1100,7 +1100,7 @@ static inline void _raii_cleanup_block(_raii_cleanup_block_t *b) { (*b)(); }
*/ */
char *ast_crypt(const char *key, const char *salt); char *ast_crypt(const char *key, const char *salt);
/* /*!
* \brief Asterisk wrapper around crypt(3) for encrypting passwords. * \brief Asterisk wrapper around crypt(3) for encrypting passwords.
* *
* This function will generate a random salt and encrypt the given password. * This function will generate a random salt and encrypt the given password.
@@ -1113,7 +1113,7 @@ char *ast_crypt(const char *key, const char *salt);
*/ */
char *ast_crypt_encrypt(const char *key); char *ast_crypt_encrypt(const char *key);
/* /*!
* \brief Asterisk wrapper around crypt(3) for validating passwords. * \brief Asterisk wrapper around crypt(3) for validating passwords.
* *
* \param key User's password to validate. * \param key User's password to validate.
@@ -1123,7 +1123,7 @@ char *ast_crypt_encrypt(const char *key);
*/ */
int ast_crypt_validate(const char *key, const char *expected); int ast_crypt_validate(const char *key, const char *expected);
/* /*!
* \brief Test that a file exists and is readable by the effective user. * \brief Test that a file exists and is readable by the effective user.
* \since 13.7.0 * \since 13.7.0
* *
@@ -1133,7 +1133,7 @@ int ast_crypt_validate(const char *key, const char *expected);
*/ */
int ast_file_is_readable(const char *filename); int ast_file_is_readable(const char *filename);
/* /*!
* \brief Compare 2 major.minor.patch.extra version strings. * \brief Compare 2 major.minor.patch.extra version strings.
* \since 13.7.0 * \since 13.7.0
* *
@@ -1146,7 +1146,7 @@ int ast_file_is_readable(const char *filename);
*/ */
int ast_compare_versions(const char *version1, const char *version2); int ast_compare_versions(const char *version1, const char *version2);
/* /*!
* \brief Test that an OS supports IPv6 Networking. * \brief Test that an OS supports IPv6 Networking.
* \since 13.14.0 * \since 13.14.0
* *
@@ -1160,7 +1160,7 @@ enum ast_fd_flag_operation {
AST_FD_FLAG_CLEAR, AST_FD_FLAG_CLEAR,
}; };
/* /*!
* \brief Set flags on the given file descriptor * \brief Set flags on the given file descriptor
* \since 13.19 * \since 13.19
* *
@@ -1176,7 +1176,7 @@ enum ast_fd_flag_operation {
#define ast_fd_set_flags(fd, flags) \ #define ast_fd_set_flags(fd, flags) \
__ast_fd_set_flags((fd), (flags), AST_FD_FLAG_SET, __FILE__, __LINE__, __PRETTY_FUNCTION__) __ast_fd_set_flags((fd), (flags), AST_FD_FLAG_SET, __FILE__, __LINE__, __PRETTY_FUNCTION__)
/* /*!
* \brief Clear flags on the given file descriptor * \brief Clear flags on the given file descriptor
* \since 13.19 * \since 13.19
* *

6
main/pbx_functions.c
View File

@@ -302,7 +302,8 @@ int ast_custom_function_unregister(struct ast_custom_function *acf)
* \return True (non-zero) if reads escalate privileges. * \return True (non-zero) if reads escalate privileges.
* \return False (zero) if reads just read. * \return False (zero) if reads just read.
*/ */
static int read_escalates(const struct ast_custom_function *acf) { static int read_escalates(const struct ast_custom_function *acf)
{
return acf->read_escalates; return acf->read_escalates;
} }
@@ -313,7 +314,8 @@ static int read_escalates(const struct ast_custom_function *acf) {
* \return True (non-zero) if writes escalate privileges. * \return True (non-zero) if writes escalate privileges.
* \return False (zero) if writes just write. * \return False (zero) if writes just write.
*/ */
static int write_escalates(const struct ast_custom_function *acf) { static int write_escalates(const struct ast_custom_function *acf)
{
return acf->write_escalates; return acf->write_escalates;
} }