switch source tree from k&r to c99

This commit is contained in:
nhmall
2021-01-26 21:06:16 -05:00
parent a2a9cb7b4f
commit f963c5aca7
232 changed files with 12099 additions and 17782 deletions
+20 -33
View File
@@ -14,8 +14,8 @@
#include <string.h>
#endif
static void FDECL(grow_ld, (libdir **, int *, int));
static void FDECL(xexit, (int)) NORETURN;
static void grow_ld(libdir **, int *, int);
static void xexit(int) NORETURN;
#ifdef DLB
#ifdef DLBLIB
@@ -24,16 +24,16 @@ static void FDECL(xexit, (int)) NORETURN;
#define LIBLISTFILE "dlb.lst" /* default list file */
/* library functions (from dlb.c) */
extern boolean FDECL(open_library, (const char *, library *));
extern void FDECL(close_library, (library *));
extern boolean open_library(const char *, library *);
extern void close_library(library *);
char *FDECL(eos, (char *)); /* also used by dlb.c */
FILE *FDECL(fopen_datafile, (const char *, const char *));
char *eos(char *); /* also used by dlb.c */
FILE *fopen_datafile(const char *, const char *);
static void FDECL(Write, (int, char *, long));
static void NDECL(usage) NORETURN;
static void NDECL(verbose_help) NORETURN;
static void FDECL(write_dlb_directory, (int, int, libdir *, long, long, long));
static void Write(int, char *, long);
static void usage(void) NORETURN;
static void verbose_help(void) NORETURN;
static void write_dlb_directory(int, int, libdir *, long, long, long);
static char default_progname[] = "dlb";
static char *progname = default_progname;
@@ -77,7 +77,7 @@ static char origdir[255] = "";
*/
static void
usage()
usage(void)
{
(void) printf("Usage: %s [ctxCIfv] arguments... [files...]\n", progname);
(void) printf(" default library is %s\n", library_file);
@@ -87,7 +87,7 @@ usage()
}
static void
verbose_help()
verbose_help(void)
{
static const char *const long_help[] = {
"", "dlb COMMANDoptions args... files...", " commands:",
@@ -109,10 +109,7 @@ verbose_help()
}
static void
Write(out, buf, len)
int out;
char *buf;
long len;
Write(int out, char *buf, long len)
{
#if defined(MSDOS) && !defined(__DJGPP__)
unsigned short slen;
@@ -133,8 +130,7 @@ long len;
}
char *
eos(s)
char *s;
eos(char *s)
{
while (*s)
s++;
@@ -143,8 +139,7 @@ char *s;
/* open_library(dlb.c) needs this (which normally comes from src/files.c) */
FILE *
fopen_datafile(filename, mode)
const char *filename, *mode;
fopen_datafile(const char *filename, const char *mode)
{
return fopen(filename, mode);
}
@@ -153,9 +148,7 @@ const char *filename, *mode;
#endif /* DLB */
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
#ifdef DLB
#ifdef DLBLIB
@@ -486,10 +479,7 @@ char **argv;
#ifdef DLBLIB
static void
grow_ld(ld_p, ldlimit_p, alloc_incr)
libdir **ld_p;
int *ldlimit_p;
int alloc_incr;
grow_ld(libdir **ld_p, int *ldlimit_p, int alloc_incr)
{
static libdir zerolibdir;
int i = 0, newlimit = *ldlimit_p + alloc_incr;
@@ -506,10 +496,8 @@ int alloc_incr;
}
static void
write_dlb_directory(out, nfiles, ld, slen, dir_size, flen)
int out, nfiles;
libdir *ld;
long slen, dir_size, flen;
write_dlb_directory(int out, int nfiles, libdir *ld,
long slen, long dir_size, long flen)
{
char buf[BUFSIZ];
int i;
@@ -539,8 +527,7 @@ long slen, dir_size, flen;
#endif /* DLB */
static void
xexit(retcd)
int retcd;
xexit(int retcd)
{
#ifdef DLB
#ifdef AMIGA