X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fecp.c;h=faec37bf2952ba3bc03dacd0bb410bed3657a39f;hb=HEAD;hp=e5754e5516f3730fa6b83ea678b89747412434d6;hpb=7977da267649fee17261d0d163a12863f3534b57;p=ppp.git

diff --git a/pppd/ecp.c b/pppd/ecp.c
index e5754e5..ffd2801 100644
--- a/pppd/ecp.c
+++ b/pppd/ecp.c
@@ -46,7 +46,7 @@
  * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
+ *     <paulus@ozlabs.org>".
  *
  * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
  * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -57,17 +57,18 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: ecp.c,v 1.4 2004/11/04 10:02:26 paulus Exp $"
-
-static const char rcsid[] = RCSID;
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <string.h>
 
-#include "pppd.h"
+#include "pppd-private.h"
+#include "options.h"
 #include "fsm.h"
 #include "ecp.h"
 
-static option_t ecp_option_list[] = {
+static struct option ecp_option_list[] = {
     { "noecp", o_bool, &ecp_protent.enabled_flag,
       "Disable ECP negotiation" },
     { "-ecp", o_bool, &ecp_protent.enabled_flag,
@@ -79,20 +80,20 @@ static option_t ecp_option_list[] = {
 /*
  * Protocol entry points from main code.
  */
-static void ecp_init __P((int unit));
+static void ecp_init (int unit);
 /*
-static void ecp_open __P((int unit));
-static void ecp_close __P((int unit, char *));
-static void ecp_lowerup __P((int unit));
-static void ecp_lowerdown __P((int));
-static void ecp_input __P((int unit, u_char *pkt, int len));
-static void ecp_protrej __P((int unit));
+static void ecp_open (int unit);
+static void ecp_close (int unit, char *);
+static void ecp_lowerup (int unit);
+static void ecp_lowerdown (int);
+static void ecp_input (int unit, u_char *pkt, int len);
+static void ecp_protrej (int unit);
 */
-static int  ecp_printpkt __P((u_char *pkt, int len,
-			      void (*printer) __P((void *, char *, ...)),
-			      void *arg));
+static int  ecp_printpkt (u_char *pkt, int len,
+			  void (*printer)(void *, char *, ...),
+			  void *arg);
 /*
-static void ecp_datainput __P((int unit, u_char *pkt, int len));
+static void ecp_datainput (int unit, u_char *pkt, int len);
 */
 
 struct protent ecp_protent = {
@@ -143,8 +144,7 @@ static fsm_callbacks ecp_callbacks = {
  * ecp_init - initialize ECP.
  */
 static void
-ecp_init(unit)
-    int unit;
+ecp_init(int unit)
 {
     fsm *f = &ecp_fsm[unit];
 
@@ -162,11 +162,8 @@ ecp_init(unit)
 
 
 static int
-ecp_printpkt(p, plen, printer, arg)
-    u_char *p;
-    int plen;
-    void (*printer) __P((void *, char *, ...));
-    void *arg;
+ecp_printpkt(u_char *p, int plen,
+	     void (*printer)(void *, char *, ...), void *arg)
 {
     return 0;
 }