[PATCH] cpukit: pppd: fix compile warning

Gedare Bloom gedare at rtems.org
Wed Apr 13 16:09:54 UTC 2016


I applied it as-is, just leave it off for the future

On Wed, Apr 13, 2016 at 1:30 AM, Peng Fan <van.freenix at gmail.com> wrote:
> Hi,
>
> On Tue, Apr 05, 2016 at 10:23:00AM -0400, Gedare Bloom wrote:
>>This should be fine. I don't know, does pppd have an active maintainer?
>
> Just kindly ping, will this be merged?
>
>>
>>On Tue, Apr 5, 2016 at 8:45 AM, Peng Fan <van.freenix at gmail.com> wrote:
>>> rcsid is defined, but not used. So discard it.
>>>
>>> Signed-off-by: Peng Fan <van.freenix at gmail.com>
>
> Do I need to drop the signoff and send out V2?
>
> Thanks,
> Peng.
>
>>> ---
>>>  cpukit/pppd/auth.c      | 4 ----
>>>  cpukit/pppd/ccp.c       | 4 ----
>>>  cpukit/pppd/chap.c      | 4 ----
>>>  cpukit/pppd/demand.c    | 4 ----
>>>  cpukit/pppd/fsm.c       | 4 ----
>>>  cpukit/pppd/ipcp.c      | 4 ----
>>>  cpukit/pppd/lcp.c       | 4 ----
>>>  cpukit/pppd/magic.c     | 4 ----
>>>  cpukit/pppd/options.c   | 4 ----
>>>  cpukit/pppd/rtemsmain.c | 4 ----
>>>  cpukit/pppd/sys-rtems.c | 5 -----
>>>  cpukit/pppd/upap.c      | 4 ----
>>>  cpukit/pppd/utils.c     | 4 ----
>>>  13 files changed, 53 deletions(-)
>>>
>>> diff --git a/cpukit/pppd/auth.c b/cpukit/pppd/auth.c
>>> index fb84f1e..9df1d32 100644
>>> --- a/cpukit/pppd/auth.c
>>> +++ b/cpukit/pppd/auth.c
>>> @@ -32,8 +32,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  #include <stdio.h>
>>>  #include <stddef.h>
>>>  #include <stdlib.h>
>>> @@ -75,8 +73,6 @@
>>>  #endif
>>>  #include "pathnames.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /* The name by which the peer authenticated itself to us. */
>>>  char peer_authname[MAXNAMELEN];
>>>
>>> diff --git a/cpukit/pppd/ccp.c b/cpukit/pppd/ccp.c
>>> index d80df27..6ada96c 100644
>>> --- a/cpukit/pppd/ccp.c
>>> +++ b/cpukit/pppd/ccp.c
>>> @@ -25,8 +25,6 @@
>>>   * OR MODIFICATIONS.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  #include <stdlib.h>
>>>  #include <string.h>
>>>
>>> @@ -35,8 +33,6 @@
>>>  #include "ccp.h"
>>>  #include <net/ppp_comp.h>
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /*
>>>   * Command-line options.
>>>   */
>>> diff --git a/cpukit/pppd/chap.c b/cpukit/pppd/chap.c
>>> index 3fe766f..55f1896 100644
>>> --- a/cpukit/pppd/chap.c
>>> +++ b/cpukit/pppd/chap.c
>>> @@ -33,8 +33,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  /*
>>>   * TODO:
>>>   */
>>> @@ -52,8 +50,6 @@
>>>  #include "chap_ms.h"
>>>  #endif
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /*
>>>   * Command-line options.
>>>   */
>>> diff --git a/cpukit/pppd/demand.c b/cpukit/pppd/demand.c
>>> index a094a15..a5c13f7 100644
>>> --- a/cpukit/pppd/demand.c
>>> +++ b/cpukit/pppd/demand.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$";
>>> -
>>>  #include <stdio.h>
>>>  #include <stdlib.h>
>>>  #include <string.h>
>>> @@ -43,8 +41,6 @@
>>>  #include "ipcp.h"
>>>  #include "lcp.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  static unsigned char *frame;
>>>  static int framelen;
>>>  static int framemax;
>>> diff --git a/cpukit/pppd/fsm.c b/cpukit/pppd/fsm.c
>>> index ce06401..4ff17d8 100644
>>> --- a/cpukit/pppd/fsm.c
>>> +++ b/cpukit/pppd/fsm.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  /*
>>>   * TODO:
>>>   * Randomize fsm id on link/init.
>>> @@ -32,8 +30,6 @@
>>>  #include "pppd.h"
>>>  #include "fsm.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  static void fsm_timeout(void *);
>>>  static void fsm_rconfreq(fsm *, u_char, u_char *, int);
>>>  static void fsm_rconfack(fsm *, int, u_char *, int);
>>> diff --git a/cpukit/pppd/ipcp.c b/cpukit/pppd/ipcp.c
>>> index fd23ddd..a9a8f24 100644
>>> --- a/cpukit/pppd/ipcp.c
>>> +++ b/cpukit/pppd/ipcp.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  /*
>>>   * TODO:
>>>   */
>>> @@ -40,8 +38,6 @@
>>>
>>>  #include <rtems/bsdnet/servers.h>
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /* global vars */
>>>  ipcp_options ipcp_wantoptions[NUM_PPP];        /* Options that we want to request */
>>>  ipcp_options ipcp_gotoptions[NUM_PPP]; /* Options that peer ack'd */
>>> diff --git a/cpukit/pppd/lcp.c b/cpukit/pppd/lcp.c
>>> index 9da1326..e09e8fb 100644
>>> --- a/cpukit/pppd/lcp.c
>>> +++ b/cpukit/pppd/lcp.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$";
>>> -
>>>  /*
>>>   * TODO:
>>>   */
>>> @@ -33,8 +31,6 @@
>>>  #include "chap.h"
>>>  #include "magic.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /*
>>>   * LCP-related command-line options.
>>>   */
>>> diff --git a/cpukit/pppd/magic.c b/cpukit/pppd/magic.c
>>> index 3d297e5..46add2f 100644
>>> --- a/cpukit/pppd/magic.c
>>> +++ b/cpukit/pppd/magic.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  #include <stdio.h>
>>>  #include <stdlib.h>
>>>  #include <unistd.h>
>>> @@ -28,8 +26,6 @@
>>>  #include "pppd.h"
>>>  #include "magic.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /*
>>>   * magic_init - Initialize the magic number generator.
>>>   *
>>> diff --git a/cpukit/pppd/options.c b/cpukit/pppd/options.c
>>> index 8a39266..9086e55 100644
>>> --- a/cpukit/pppd/options.c
>>> +++ b/cpukit/pppd/options.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  #include <ctype.h>
>>>  #include <stdio.h>
>>>  #include <errno.h>
>>> @@ -53,8 +51,6 @@
>>>
>>>  #include <net/ppp_comp.h>
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /*
>>>   * Option variables and default values.
>>>   */
>>> diff --git a/cpukit/pppd/rtemsmain.c b/cpukit/pppd/rtemsmain.c
>>> index 89ed776..030bebe 100644
>>> --- a/cpukit/pppd/rtemsmain.c
>>> +++ b/cpukit/pppd/rtemsmain.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  #include <stdio.h>
>>>  #include <ctype.h>
>>>  #include <stdlib.h>
>>> @@ -68,8 +66,6 @@
>>>  #include "atcp.h"
>>>  #endif
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  /* interface vars */
>>>  char ifname[32];               /* Interface name */
>>>  int pppifunit;                 /* Interface unit number */
>>> diff --git a/cpukit/pppd/sys-rtems.c b/cpukit/pppd/sys-rtems.c
>>> index ac87957..3fdca9e 100644
>>> --- a/cpukit/pppd/sys-rtems.c
>>> +++ b/cpukit/pppd/sys-rtems.c
>>> @@ -20,8 +20,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  #include <stdio.h>
>>>  #include <string.h>
>>>  #include <stdlib.h>
>>> @@ -66,9 +64,6 @@ extern rtems_id rtems_pppd_taskid;
>>>  #include "fsm.h"
>>>  #include "ipcp.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>> -
>>>  static int initdisc = -1;      /* Initial TTY discipline for ppp_fd */
>>>  static int initfdflags = -1;   /* Initial file descriptor flags for ppp_fd */
>>>  static int ppp_fd = -1;                /* fd which is set to PPP discipline */
>>> diff --git a/cpukit/pppd/upap.c b/cpukit/pppd/upap.c
>>> index e8115a6..55700c5 100644
>>> --- a/cpukit/pppd/upap.c
>>> +++ b/cpukit/pppd/upap.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  /*
>>>   * TODO:
>>>   */
>>> @@ -29,8 +27,6 @@
>>>  #include "pppd.h"
>>>  #include "upap.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  static bool hide_password = true;
>>>
>>>  /*
>>> diff --git a/cpukit/pppd/utils.c b/cpukit/pppd/utils.c
>>> index af39226..cb1dab3 100644
>>> --- a/cpukit/pppd/utils.c
>>> +++ b/cpukit/pppd/utils.c
>>> @@ -17,8 +17,6 @@
>>>   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>>>   */
>>>
>>> -#define RCSID  "$Id$"
>>> -
>>>  #include <stdio.h>
>>>  #include <ctype.h>
>>>  #include <stdlib.h>
>>> @@ -44,8 +42,6 @@
>>>
>>>  #include "pppd.h"
>>>
>>> -static const char rcsid[] = RCSID;
>>> -
>>>  static void pr_log(void *, char *, ...);
>>>  static void logit(int, char *, va_list);
>>>  static void vslp_printer(void *, char *, ...);
>>> --
>>> 2.6.2
>>>
>>> _______________________________________________
>>> devel mailing list
>>> devel at rtems.org
>>> http://lists.rtems.org/mailman/listinfo/devel



More information about the devel mailing list