patch-pppd_ccp_c 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081
  1. --- ppp-2.4.5.orig/pppd/ccp.c 2009-11-16 23:26:07.000000000 +0100
  2. +++ ppp-2.4.5/pppd/ccp.c 2014-03-17 16:13:13.000000000 +0100
  3. @@ -57,8 +57,8 @@ static const char rcsid[] = RCSID;
  4. /*
  5. * Command-line options.
  6. */
  7. -static int setbsdcomp __P((char **));
  8. -static int setdeflate __P((char **));
  9. +static int setbsdcomp (char **);
  10. +static int setdeflate (char **);
  11. static char bsd_value[8];
  12. static char deflate_value[8];
  13. @@ -164,17 +164,17 @@ static option_t ccp_option_list[] = {
  14. /*
  15. * Protocol entry points from main code.
  16. */
  17. -static void ccp_init __P((int unit));
  18. -static void ccp_open __P((int unit));
  19. -static void ccp_close __P((int unit, char *));
  20. -static void ccp_lowerup __P((int unit));
  21. -static void ccp_lowerdown __P((int));
  22. -static void ccp_input __P((int unit, u_char *pkt, int len));
  23. -static void ccp_protrej __P((int unit));
  24. -static int ccp_printpkt __P((u_char *pkt, int len,
  25. +static void ccp_init (int unit);
  26. +static void ccp_open (int unit);
  27. +static void ccp_close (int unit, char *);
  28. +static void ccp_lowerup (int unit);
  29. +static void ccp_lowerdown (int);
  30. +static void ccp_input (int unit, u_char *pkt, int len);
  31. +static void ccp_protrej (int unit);
  32. +static int ccp_printpkt (u_char *pkt, int len,
  33. void (*printer) __P((void *, char *, ...)),
  34. - void *arg));
  35. -static void ccp_datainput __P((int unit, u_char *pkt, int len));
  36. + void *arg);
  37. +static void ccp_datainput (int unit, u_char *pkt, int len);
  38. struct protent ccp_protent = {
  39. PPP_CCP,
  40. @@ -205,18 +205,18 @@ ccp_options ccp_hisoptions[NUM_PPP]; /*
  41. /*
  42. * Callbacks for fsm code.
  43. */
  44. -static void ccp_resetci __P((fsm *));
  45. -static int ccp_cilen __P((fsm *));
  46. -static void ccp_addci __P((fsm *, u_char *, int *));
  47. -static int ccp_ackci __P((fsm *, u_char *, int));
  48. -static int ccp_nakci __P((fsm *, u_char *, int, int));
  49. -static int ccp_rejci __P((fsm *, u_char *, int));
  50. -static int ccp_reqci __P((fsm *, u_char *, int *, int));
  51. -static void ccp_up __P((fsm *));
  52. -static void ccp_down __P((fsm *));
  53. -static int ccp_extcode __P((fsm *, int, int, u_char *, int));
  54. -static void ccp_rack_timeout __P((void *));
  55. -static char *method_name __P((ccp_options *, ccp_options *));
  56. +static void ccp_resetci (fsm *);
  57. +static int ccp_cilen (fsm *);
  58. +static void ccp_addci (fsm *, u_char *, int *);
  59. +static int ccp_ackci (fsm *, u_char *, int);
  60. +static int ccp_nakci (fsm *, u_char *, int, int);
  61. +static int ccp_rejci (fsm *, u_char *, int);
  62. +static int ccp_reqci (fsm *, u_char *, int *, int);
  63. +static void ccp_up (fsm *);
  64. +static void ccp_down (fsm *);
  65. +static int ccp_extcode (fsm *, int, int, u_char *, int);
  66. +static void ccp_rack_timeout (void *);
  67. +static char *method_name (ccp_options *, ccp_options *);
  68. static fsm_callbacks ccp_callbacks = {
  69. ccp_resetci,
  70. @@ -1489,7 +1489,7 @@ static int
  71. ccp_printpkt(p, plen, printer, arg)
  72. u_char *p;
  73. int plen;
  74. - void (*printer) __P((void *, char *, ...));
  75. + void (*printer) (void *, char *, ...);
  76. void *arg;
  77. {
  78. u_char *p0, *optend;