diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 2 | ||||
| -rw-r--r-- | main/ast_expr2.c | 2 | ||||
| -rw-r--r-- | main/dns.c | 2 | ||||
| -rw-r--r-- | main/event.c | 4 | ||||
| -rw-r--r-- | main/features.c | 2 | ||||
| -rw-r--r-- | main/srv.c | 2 | ||||
| -rw-r--r-- | main/utils.c | 3 |
7 files changed, 7 insertions, 10 deletions
diff --git a/main/Makefile b/main/Makefile index fe9caa967..14fa19ae6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -140,7 +140,7 @@ ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: ASTCFLAGS+=$(GMIME_INCLUDE) endif -stdtime/localtime.o: ASTCFLAGS+=$(AST_NO_STRICT_OVERFLOW) +stdtime/localtime.o: ASTCFLAGS+=$(AST_NO_STRICT_OVERFLOW) -Wno-format-nonliteral AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS)) AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep))) diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 2534938b2..147604380 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -360,7 +360,7 @@ enum valtype { } ; #ifdef STANDALONE -void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__ ((format (printf,5,6))); +void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) __attribute__((format(printf,5,6))); #endif struct val { diff --git a/main/dns.c b/main/dns.c index ad1673830..66c21b367 100644 --- a/main/dns.c +++ b/main/dns.c @@ -156,7 +156,7 @@ struct dn_answer { unsigned short class; unsigned int ttl; unsigned short size; -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); static int skip_name(unsigned char *s, int len) { diff --git a/main/event.c b/main/event.c index 0d139c51a..17a25d25f 100644 --- a/main/event.c +++ b/main/event.c @@ -50,7 +50,7 @@ struct ast_event_ie { /*! Total length of the IE payload */ uint16_t ie_payload_len; unsigned char ie_payload[0]; -} __attribute__ ((packed)); +} __attribute__((packed)); /*! * \brief An event @@ -70,7 +70,7 @@ struct ast_event { uint16_t event_len:16; /*! The data payload of the event, made up of information elements */ unsigned char payload[0]; -} __attribute__ ((packed)); +} __attribute__((packed)); struct ast_event_ref { struct ast_event *event; diff --git a/main/features.c b/main/features.c index 493cf569d..21dbcb09b 100644 --- a/main/features.c +++ b/main/features.c @@ -231,7 +231,7 @@ static void check_goto_on_transfer(struct ast_channel *chan) goto_on_transfer = ast_strdupa(val); - if (!(xferchan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, chan->name))) + if (!(xferchan = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, "", "", "", 0, "%s", chan->name))) return; for (x = goto_on_transfer; x && *x; x++) { diff --git a/main/srv.c b/main/srv.c index 1899e8b8f..664062b64 100644 --- a/main/srv.c +++ b/main/srv.c @@ -73,7 +73,7 @@ static int parse_srv(unsigned char *answer, int len, unsigned char *msg, struct unsigned short priority; unsigned short weight; unsigned short port; - } __attribute__ ((__packed__)) *srv = (struct srv *) answer; + } __attribute__((__packed__)) *srv = (struct srv *) answer; int res = 0; char repl[256] = ""; diff --git a/main/utils.c b/main/utils.c index f99ff8545..cb68cdc47 100644 --- a/main/utils.c +++ b/main/utils.c @@ -1430,7 +1430,6 @@ int __ast_string_field_ptr_grow(struct ast_string_field_mgr *mgr, size_t needed, return 0; } -__attribute((format (printf, 4, 0))) void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr, struct ast_string_field_pool **pool_head, const ast_string_field *ptr, const char *format, va_list ap1, va_list ap2) @@ -1462,7 +1461,6 @@ void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr, mgr->used += needed; } -__attribute((format (printf, 4, 5))) void __ast_string_field_ptr_build(struct ast_string_field_mgr *mgr, struct ast_string_field_pool **pool_head, const ast_string_field *ptr, const char *format, ...) @@ -1554,7 +1552,6 @@ int ast_get_time_t(const char *src, time_t *dst, time_t _default, int *consumed) * ast_str_append_va(...) */ -__attribute__((format (printf, 4, 0))) int __ast_str_helper(struct ast_str **buf, size_t max_len, int append, const char *fmt, va_list ap) { |