Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]).

diff --git a/chpass/Makefile b/chpass/Makefile
index f19a25730d1fdc41e5623f693142a15b305b8229..3abed829d3ac79e556273266f031e5551c43af2f 100644 (file)
--- a/chpass/Makefile
+++ b/chpass/Makefile
@@ -1,6 +1,7 @@
 #      @(#)Makefile    8.2 (Berkeley) 4/2/94
 
 PROG=  chpass
+CFLAGS+=-Wall
 SRCS=  chpass.c edit.c field.c pw_copy.c pw_scan.c pw_util.c pw_yp.c \
        table.c util.c ypxfr_misc.c ${GENSRCS}
 GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c yppasswd_private.h \

diff --git a/chpass/chpass.c b/chpass/chpass.c
index 982548fa5a46986318f3f6b27f7f6e95d4c5e9b3..2809f8bef74f872750b48ee90ececcb37ad27c8c 100644 (file)
--- a/chpass/chpass.c
+++ b/chpass/chpass.c
@@ -32,15 +32,15 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993, 1994\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "From: @(#)chpass.c     8.4 (Berkeley) 4/2/94";
-static char rcsid[] =
-       "$Id: chpass.c,v 1.13 1997/02/22 19:54:25 peter Exp $";
+static const char sccsid[] = "From: @(#)chpass.c       8.4 (Berkeley) 4/2/94";
+static const char rcsid[] =
+       "$Id: chpass.c,v 1.14 1997/03/29 04:28:38 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -83,10 +83,10 @@ main(argc, argv)
        char **argv;
 {
        enum { NEWSH, LOADENTRY, EDITENTRY, NEWPW, NEWEXP } op;
-       struct passwd *pw, lpw;
+       struct passwd *pw = NULL, lpw;
        char *username = NULL;
        int ch, pfd, tfd;
-       char *arg;
+       char *arg = NULL;
 #ifdef YP
        int force_local = 0;
        int force_yp = 0;

diff --git a/chpass/edit.c b/chpass/edit.c
index 68dbc0ea50e382da1a17ff793842a50b44faaa18..9cae42e753fc2dd1fe4795243c1c8df6849fd3fa 100644 (file)
--- a/chpass/edit.c
+++ b/chpass/edit.c
@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: edit.c,v 1.10 1997/06/25 06:59:55 charnier Exp $
+ *     $Id: edit.c,v 1.11 1998/08/14 03:18:32 thepish Exp $
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)edit.c     8.3 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)edit.c       8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>

diff --git a/chpass/field.c b/chpass/field.c
index 73fa4795a2e07d7aff682331bd91625202cfb524..997d21feed3086370a92418a862f78fc7e6cd69b 100644 (file)
--- a/chpass/field.c
+++ b/chpass/field.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)field.c    8.4 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)field.c      8.4 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/param.h>

diff --git a/chpass/table.c b/chpass/table.c
index eed097eebad816b24a8ea78674b251d820ffa451..1bc857b87ca8e35367c5158d324e4a2c64ecfc53 100644 (file)
--- a/chpass/table.c
+++ b/chpass/table.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)table.c    8.3 (Berkeley) 4/2/94";
+static const char sccsid[] = "@(#)table.c      8.3 (Berkeley) 4/2/94";
 #endif /* not lint */
 
 #include <sys/types.h>