diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2012-09-04 20:29:18 +0200 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-09-05 22:16:03 +0400 |
| commit | 5f355048894ede9e983c7f02cc5915385620db3f (patch) | |
| tree | 546bfa35e93ad271078da7fac67e14cc8e798548 /accel-pppd/ctrl | |
| parent | 07ead7eed242981335aadd34aa3d7b3e7da33b81 (diff) | |
| download | accel-ppp-5f355048894ede9e983c7f02cc5915385620db3f.tar.gz accel-ppp-5f355048894ede9e983c7f02cc5915385620db3f.zip | |
Fix format string errors
Fix several errors and compiler warnings in format string
arguments.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Diffstat (limited to 'accel-pppd/ctrl')
| -rw-r--r-- | accel-pppd/ctrl/l2tp/packet.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/cli.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 2 | ||||
| -rw-r--r-- | accel-pppd/ctrl/pptp/pptp.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/accel-pppd/ctrl/l2tp/packet.c b/accel-pppd/ctrl/l2tp/packet.c index 60b9d36c..70d8d5d9 100644 --- a/accel-pppd/ctrl/l2tp/packet.c +++ b/accel-pppd/ctrl/l2tp/packet.c @@ -158,7 +158,7 @@ int l2tp_recv(int fd, struct l2tp_packet_t **p, struct in_pktinfo *pkt_info) if (n < sizeof(*hdr)) { if (conf_verbose) - log_warn("l2tp: short packet received (%i/%i)\n", n, sizeof(*hdr)); + log_warn("l2tp: short packet received (%i/%zu)\n", n, sizeof(*hdr)); goto out_err_hdr; } diff --git a/accel-pppd/ctrl/pppoe/cli.c b/accel-pppd/ctrl/pppoe/cli.c index 847b8547..26846402 100644 --- a/accel-pppd/ctrl/pppoe/cli.c +++ b/accel-pppd/ctrl/pppoe/cli.c @@ -120,7 +120,7 @@ static int show_service_name_exec(const char *cmd, char * const *f, int f_cnt, v if (conf_service_name) cli_sendv(cli, "%s\r\n", conf_service_name); else - cli_sendv(cli, "*\r\n", conf_service_name); + cli_sendv(cli, "*\r\n"); return CLI_CMD_OK; } diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index e620668f..f36a1cc5 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1350,7 +1350,7 @@ static int init_secret(struct pppoe_serv_t *serv) DES_cblock key; if (read(urandom_fd, serv->secret, SECRET_LENGTH) < 0) { - log_emerg("pppoe: failed to read /dev/urandom\n", strerror(errno)); + log_emerg("pppoe: failed to read /dev/urandom: %s\n", strerror(errno)); return -1; } diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c index f2e9d43c..a3476c5e 100644 --- a/accel-pppd/ctrl/pptp/pptp.c +++ b/accel-pppd/ctrl/pptp/pptp.c @@ -1,3 +1,4 @@ +#include <inttypes.h> #include <unistd.h> #include <stdlib.h> #include <stdio.h> @@ -222,7 +223,7 @@ static int pptp_start_ctrl_conn_rqst(struct pptp_conn_t *conn) } if (msg->version != htons(PPTP_VERSION)) { - log_ppp_warn("PPTP version mismatch: expecting %x, received %s\n", PPTP_VERSION, msg->version); + log_ppp_warn("PPTP version mismatch: expecting %x, received %" PRIu32 "\n", PPTP_VERSION, msg->version); if (send_pptp_start_ctrl_conn_rply(conn, PPTP_CONN_RES_PROTOCOL, 0)) return -1; return 0; |