diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-18 16:26:59 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-18 16:26:59 +0000 |
| commit | cee0e75c84e3987bba0c48b0bb0dd1ffebd9f4a4 (patch) | |
| tree | 542df505ee7d47b0d9925018948c628dec37dc70 /channels/misdn | |
| parent | 48d2267d2d05bf4acaa2ae4e00e3d9b600cce235 (diff) | |
Merged revisions 109475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r109475 | kpfleming | 2008-03-18 11:23:05 -0500 (Tue, 18 Mar 2008) | 2 lines
fix up various warnings found via the addition of format string checking... some of these were really, really bad code
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@109487 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
| -rw-r--r-- | channels/misdn/isdn_lib.c | 4 | ||||
| -rw-r--r-- | channels/misdn/isdn_lib.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 90a6c8d36..d1c2c48d4 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -3243,7 +3243,7 @@ void misdn_lib_log_ies(struct misdn_bchannel *bc) cb_log(5, stack->port, " --> urate:%d rate:%d mode:%d user1:%d\n", bc->urate, bc->rate, bc->mode,bc->user1); - cb_log(5, stack->port, " --> bc:%x h:%d sh:%d\n", bc, bc->holded, bc->stack_holder); + cb_log(5, stack->port, " --> bc:%p h:%d sh:%d\n", bc, bc->holded, bc->stack_holder); } void misdn_send_lock(struct misdn_bchannel *bc); @@ -4336,7 +4336,7 @@ struct misdn_bchannel *stack_holder_find(struct misdn_stack *stack, unsigned lon { struct misdn_bchannel *help; - cb_log(4,stack?stack->port:0, "*HOLDER: find %x\n",l3id); + cb_log(4,stack?stack->port:0, "*HOLDER: find %lx\n",l3id); if (!stack) return NULL; diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h index 85922c630..8e2154d65 100644 --- a/channels/misdn/isdn_lib.h +++ b/channels/misdn/isdn_lib.h @@ -377,12 +377,14 @@ struct misdn_bchannel { enum event_response_e (*cb_event) (enum event_e event, struct misdn_bchannel *bc, void *user_data); -void (*cb_log) (int level, int port, char *tmpl, ...); +void (*cb_log) (int level, int port, char *tmpl, ...) + __attribute__ ((format (printf, 3, 4))); int (*cb_jb_empty)(struct misdn_bchannel *bc, char *buffer, int len); struct misdn_lib_iface { enum event_response_e (*cb_event)(enum event_e event, struct misdn_bchannel *bc, void *user_data); - void (*cb_log)(int level, int port, char *tmpl, ...); + void (*cb_log)(int level, int port, char *tmpl, ...) + __attribute__ ((format (printf, 3, 4))); int (*cb_jb_empty)(struct misdn_bchannel *bc, char *buffer, int len); }; |