d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constify, add some prototypes, and set WARNS=2.

Browse Source 
Submitted by:	Mike Barcroft <mike@q9media.com>
This commit is contained in:
Dima Dorfman 2001-07-15 06:20:45 +00:00
parent c33fa91f61
commit 74a5ebbd66
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/zic/private.h
View File

@ -99,7 +99,7 @@ char * imalloc P((int n));
void * irealloc P((void * pointer, int size));
void icfree P((char * pointer));
void ifree P((char * pointer));
char * scheck P((const char *string, const char *format));
const char * scheck P((const char *string, const char *format));
/*
** Finally, some convenience items.

6
usr.sbin/zic/scheck.c
View File

@ -13,7 +13,7 @@ static const char rcsid[] =
#include "private.h"
char *
const char *
scheck(string, format)
const char * const string;
const char * const format;
@ -22,7 +22,7 @@ const char * const format;
register const char * fp;
register char * tp;
register int c;
register char * result;
register const char * result;
char dummy;
static char nada;
@ -58,7 +58,7 @@ const char * const format;
*tp++ = 'c';
*tp = '\0';
if (sscanf(string, fbuf, &dummy) != 1)
result = (char *) format;
result = format;
ifree(fbuf);
return result;
}

1
usr.sbin/zic/zdump/Makefile
View File

@ -3,6 +3,7 @@
.PATH: ${.CURDIR}/..
PROG= zdump
WARNS?= 2
SRCS= zdump.c ialloc.c scheck.c
MAN= ${.CURDIR}/../zdump.8

12
usr.sbin/zic/zic.c
View File

@ -89,6 +89,7 @@ static int addtype P((long gmtoff, const char * abbr, int isdst,
static void leapadd P((time_t t, int positive, int rolling, int count));
static void adjleap P((void));
static void associate P((void));
static int atcomp P((const void * avp, const void * bvp));
static int ciequal P((const char * ap, const char * bp));
static void convert P((long val, char * buf));
static void dolink P((const char * fromfile, const char * tofile));
@ -129,6 +130,7 @@ static void setgroup P((gid_t *flag, const char *name));
static void setuser P((uid_t *flag, const char *name));
static time_t tadd P((time_t t1, long t2));
static void usage P((void));
static void warning P((const char * const string));
static void writezone P((const char * name));
static int yearistype P((int year, const char * type));
@ -1360,12 +1362,14 @@ FILE * const fp;
static int
atcomp(avp, bvp)
void * avp;
void * bvp;
const void * avp;
const void * bvp;
{
if (((struct attype *) avp)->at < ((struct attype *) bvp)->at)
if (((const struct attype *) avp)->at <
((const struct attype *) bvp)->at)
return -1;
else if (((struct attype *) avp)->at > ((struct attype *) bvp)->at)
else if (((const struct attype *) avp)->at >
((const struct attype *) bvp)->at)
return 1;
else return 0;
}

1
usr.sbin/zic/zic/Makefile
View File

@ -3,6 +3,7 @@
.PATH: ${.CURDIR}/..
PROG= zic
WARNS?= 2
SRCS= zic.c ialloc.c scheck.c
MAN= ${.CURDIR}/../zic.8