app_dial, utils.h: Avoid old style declaration and discarded qualifier.

* app_dial: Use const char* for fixed strings.
* utils.h: inline should come before return type.

Resolves: #1755

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 3c2b6a6684c02457379f9fcce9d5c9cc2018b8fb..36db4a34ec8e794ba83476e9c4f2884b98f55d3a 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -951,7 +951,7 @@ static void do_forward(struct chanlist *o, struct cause_args *num,
        struct ast_channel *c = o->chan; /* the winner */
        struct ast_channel *in = num->chan; /* the input channel */
        char *stuff;
-       char *tech;
+       const char *tech;
        int cause;
        struct ast_party_caller caller;
 

diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 7c962c8e8ad5aabbfaa72d1d3a905a6ce42a64fe..4888f4696d4780871249d983ffb8866fe4419d55 100644 (file)
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -769,7 +769,7 @@ void DO_CRASH_NORETURN __ast_assert_failed(int condition, const char *condition_
                return __VA_ARGS__; \
        }\
 })
-static void force_inline _ast_assert(int condition, const char *condition_str, const char *file, int line, const char *function)
+static force_inline void _ast_assert(int condition, const char *condition_str, const char *file, int line, const char *function)
 {
        if (__builtin_expect(!condition, 1)) {
                __ast_assert_failed(condition, condition_str, file, line, function);