patch-pppd_cbcp_c 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. --- ppp-2.4.5.orig/pppd/cbcp.c 2009-11-16 23:26:07.000000000 +0100
  2. +++ ppp-2.4.5/pppd/cbcp.c 2014-03-17 16:13:14.000000000 +0100
  3. @@ -50,7 +50,7 @@ static const char rcsid[] = RCSID;
  4. /*
  5. * Options.
  6. */
  7. -static int setcbcp __P((char **));
  8. +static int setcbcp (char **);
  9. static option_t cbcp_option_list[] = {
  10. { "callback", o_special, (void *)setcbcp,
  11. @@ -61,14 +61,14 @@ static option_t cbcp_option_list[] = {
  12. /*
  13. * Protocol entry points.
  14. */
  15. -static void cbcp_init __P((int unit));
  16. -static void cbcp_open __P((int unit));
  17. -static void cbcp_lowerup __P((int unit));
  18. -static void cbcp_input __P((int unit, u_char *pkt, int len));
  19. -static void cbcp_protrej __P((int unit));
  20. -static int cbcp_printpkt __P((u_char *pkt, int len,
  21. +static void cbcp_init (int unit);
  22. +static void cbcp_open (int unit);
  23. +static void cbcp_lowerup (int unit);
  24. +static void cbcp_input (int unit, u_char *pkt, int len);
  25. +static void cbcp_protrej (int unit);
  26. +static int cbcp_printpkt (u_char *pkt, int len,
  27. void (*printer) __P((void *, char *, ...)),
  28. - void *arg));
  29. + void *arg);
  30. struct protent cbcp_protent = {
  31. PPP_CBCP,
  32. @@ -94,11 +94,11 @@ cbcp_state cbcp[NUM_PPP];
  33. /* internal prototypes */
  34. -static void cbcp_recvreq __P((cbcp_state *us, u_char *pckt, int len));
  35. -static void cbcp_resp __P((cbcp_state *us));
  36. -static void cbcp_up __P((cbcp_state *us));
  37. -static void cbcp_recvack __P((cbcp_state *us, u_char *pckt, int len));
  38. -static void cbcp_send __P((cbcp_state *us, int code, u_char *buf, int len));
  39. +static void cbcp_recvreq (cbcp_state *us, u_char *pckt, int len);
  40. +static void cbcp_resp (cbcp_state *us);
  41. +static void cbcp_up (cbcp_state *us);
  42. +static void cbcp_recvack (cbcp_state *us, u_char *pckt, int len);
  43. +static void cbcp_send (cbcp_state *us, int code, u_char *buf, int len);
  44. /* option processing */
  45. static int
  46. @@ -227,7 +227,7 @@ static int
  47. cbcp_printpkt(p, plen, printer, arg)
  48. u_char *p;
  49. int plen;
  50. - void (*printer) __P((void *, char *, ...));
  51. + void (*printer) (void *, char *, ...);
  52. void *arg;
  53. {
  54. int code, opt, id, len, olen, delay;