drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Release calc version 2.11.0t1

Browse Source
This commit is contained in:
Landon Curt Noll
1999-09-23 21:24:49 -07:00
parent 5307c4e16b
commit bad4535616
24 changed files with 233 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CHANGES
View File

@@ -1,4 +1,24 @@
Following is the change from calc version 2.10.3t5.38 to date: Following is the change from calc version 2.11.0t1 to date:
Fixed BSDI compile problems related to sys_errlist.
Removed the makefile symbol MAIN. Now forcing all funcions to correctly
be reclared main. To passify some old broken compilers, a return 0;
(instead of an exit(0);) is used at the end of main().
A few of files that were added to calc used 4 character indentation
whereas most of calc uses 8 character indentation. These imported
sources have been changed to conform better with the calc style.
Fixed misc compile warnings.
Following is the change from calc version 2.10.3t5.38 to 2.11.0t0:
Fixed a few compile problems found under Red Hat 6.0 Linux.
Following is the change from calc version 2.10.3t5.38 to 2.11.3t5.46:
Fixed a bug discovered by Ernest Bowen related to matrix-to-matrix copies. Fixed a bug discovered by Ernest Bowen related to matrix-to-matrix copies.

32
Makefile
View File

@@ -206,18 +206,6 @@ HAVE_MEMMOVE=
ALIGN32= -DMUST_ALIGN32 ALIGN32= -DMUST_ALIGN32
#ALIGN32= -UMUST_ALIGN32 #ALIGN32= -UMUST_ALIGN32
# The return value type of main() differs from platform to platform.
# In some cases, a compiler warning is issued because main() does
# or does not return a value.
#
# MAIN= -DMAIN=void main() is of type void
# MAIN= -DMAIN=int main() is of type int
#
# When in doubt, try MAIN= -DMAIN=int. If you get a warning try the other.
#
#MAIN= -DMAIN=void
MAIN= -DMAIN=int
# where to install binary files # where to install binary files
# #
BINDIR= /usr/local/bin BINDIR= /usr/local/bin
@@ -514,7 +502,7 @@ ALLOW_CUSTOM= -DCUSTOM
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= ${CFLAGS} #CCSHS= ${CFLAGS}
# #
#LCFLAGS= #LCFLAGS=
@@ -545,7 +533,7 @@ ALLOW_CUSTOM= -DCUSTOM
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= ${CFLAGS} #CCSHS= ${CFLAGS}
# #
#LCFLAGS= #LCFLAGS=
@@ -577,7 +565,7 @@ ALLOW_CUSTOM= -DCUSTOM
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= #CCSHS=
# #
#LCFLAGS= #LCFLAGS=
@@ -603,7 +591,7 @@ ALLOW_CUSTOM= -DCUSTOM
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= ${CFLAGS} #CCSHS= ${CFLAGS}
# #
#LCFLAGS= #LCFLAGS=
@@ -623,7 +611,7 @@ ALLOW_CUSTOM= -DCUSTOM
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= ${CFLAGS} #CCSHS= ${CFLAGS}
# #
#LCFLAGS= #LCFLAGS=
@@ -646,7 +634,7 @@ ALLOW_CUSTOM= -DCUSTOM
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= ${CFLAGS} #CCSHS= ${CFLAGS}
# #
#LCFLAGS= #LCFLAGS=
@@ -669,7 +657,7 @@ ALLOW_CUSTOM= -DCUSTOM
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= ${CFLAGS} #CCSHS= ${CFLAGS}
# #
#LCFLAGS= #LCFLAGS=
@@ -692,7 +680,7 @@ CCMISC=
CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
ICFLAGS= ${CCWARN} ${CCMISC} ICFLAGS= ${CCWARN} ${CCMISC}
# #
CCMAIN= ${ICFLAGS} ${MAIN} CCMAIN= ${ICFLAGS}
CCSHS= ${CFLAGS} CCSHS= ${CFLAGS}
# #
LCFLAGS= LCFLAGS=
@@ -715,7 +703,7 @@ CC= ${PURIFY} gcc
#CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} #CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
#ICFLAGS= ${CCWARN} ${CCMISC} #ICFLAGS= ${CCWARN} ${CCMISC}
# #
#CCMAIN= ${ICFLAGS} ${MAIN} #CCMAIN= ${ICFLAGS}
#CCSHS= ${CFLAGS} #CCSHS= ${CFLAGS}
# #
#LCFLAGS= #LCFLAGS=
@@ -889,7 +877,6 @@ SAMPLE_PASSDOWN= Q="${Q}" \
TOPDIR="${TOPDIR}" \ TOPDIR="${TOPDIR}" \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
HELPDIR="${HELPDIR}" \ HELPDIR="${HELPDIR}" \
MAIN="${MAIN}" \
DEBUG="${DEBUG}" \ DEBUG="${DEBUG}" \
NO_SHARED="${NO_SHARED}" \ NO_SHARED="${NO_SHARED}" \
RANLIB="${RANLIB}" \ RANLIB="${RANLIB}" \
@@ -2203,7 +2190,6 @@ env:
@echo "HAVE_UID_T=${HAVE_UID_T}"; echo "" @echo "HAVE_UID_T=${HAVE_UID_T}"; echo ""
@echo "HAVE_NEWSTR=${HAVE_NEWSTR}"; echo "" @echo "HAVE_NEWSTR=${HAVE_NEWSTR}"; echo ""
@echo "ALIGN32=${ALIGN32}"; echo "" @echo "ALIGN32=${ALIGN32}"; echo ""
@echo "MAIN=${MAIN}"; echo ""
@echo "BINDIR=${BINDIR}"; echo "" @echo "BINDIR=${BINDIR}"; echo ""
@echo "TOPDIR=${TOPDIR}"; echo "" @echo "TOPDIR=${TOPDIR}"; echo ""
@echo "LIBDIR=${LIBDIR}"; echo "" @echo "LIBDIR=${LIBDIR}"; echo ""

5
align32.c
View File

@@ -30,7 +30,7 @@
static void buserr(void); /* catch alignment errors */ static void buserr(void); /* catch alignment errors */
MAIN int
main(void) main(void)
{ {
char byte[2*sizeof(USB32)]; /* mis-alignment buffer */ char byte[2*sizeof(USB32)]; /* mis-alignment buffer */
@@ -58,7 +58,8 @@ main(void)
'/', '/'); '/', '/');
#endif #endif
exit(0); /* exit(0); */
return 0;
} }

6
calc.c
View File

@@ -67,7 +67,7 @@ static void intint(int arg); /* interrupt routine */
/* /*
* Top level calculator routine. * Top level calculator routine.
*/ */
MAIN int
main(int argc, char **argv) main(int argc, char **argv)
{ {
static char *str; /* current option string or expression */ static char *str; /* current option string or expression */
@@ -301,8 +301,8 @@ main(int argc, char **argv)
* all done * all done
*/ */
libcalc_call_me_last(); libcalc_call_me_last();
exit(0); /* exit(0); */
/*NOTREACHED*/ return 0;
} }

5
endian.c
View File

@@ -39,7 +39,7 @@
char byte[8] = { (char)0x12, (char)0x36, (char)0x48, (char)0x59, char byte[8] = { (char)0x12, (char)0x36, (char)0x48, (char)0x59,
(char)0x01, (char)0x23, (char)0x45, (char)0x67 }; (char)0x01, (char)0x23, (char)0x45, (char)0x67 };
MAIN int
main(void) main(void)
{ {
/* pointers into the byte order array */ /* pointers into the byte order array */
@@ -75,5 +75,6 @@ main(void)
"Unknown int Byte Order, set CALC_BYTE_ORDER in Makefile\n"); "Unknown int Byte Order, set CALC_BYTE_ORDER in Makefile\n");
exit(1); exit(1);
} }
exit(0); /* exit(0); */
return 0;
} }

4
file.c
View File

@@ -1980,11 +1980,11 @@ fscanfile(FILE *fp, char *fmt, int count, VALUE **vals)
for (;;) { for (;;) {
for (;;) { for (;;) {
f = *fmt++; f = *fmt++;
if (isspace(f)) { if (isspace((int)f)) {
getscanwhite(fp,1,0,6,NULL); getscanwhite(fp,1,0,6,NULL);
do { do {
f = *fmt++; f = *fmt++;
} while (isspace(f)); } while (isspace((int)f));
} }
c = fgetc(fp); c = fgetc(fp);
if (c == EOF) if (c == EOF)

5
fposval.c
View File

@@ -60,7 +60,7 @@
char *program; /* our name */ char *program; /* our name */
MAIN int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int stsizelen; /* bit length of st_size in buf */ int stsizelen; /* bit length of st_size in buf */
@@ -225,5 +225,6 @@ main(int argc, char **argv)
printf("#define SWAP_HALF_IN_INODE(dest, src)\t%s%d%s\n", printf("#define SWAP_HALF_IN_INODE(dest, src)\t%s%d%s\n",
"memcpy((void *)(dest), (void *)(src), sizeof(",inodelen,"))"); "memcpy((void *)(dest), (void *)(src), sizeof(",inodelen,"))");
#endif /* CALC_BYTE_ORDER == BIG_ENDIAN */ #endif /* CALC_BYTE_ORDER == BIG_ENDIAN */
exit(0); /* exit(0); */
return 0;
} }

8
func.c
View File

@@ -10,6 +10,7 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#include <errno.h>
#if defined(FUNCLIST) #if defined(FUNCLIST)
@@ -77,9 +78,6 @@ static VALUE f_fsize(VALUE *vp);
/* /*
* external declarations * external declarations
*/ */
extern int errno; /* last system error */
extern const char *const sys_errlist[]; /* system error messages */
extern int sys_nerr; /* number of system errors */
extern char cmdbuf[]; /* command line expression */ extern char cmdbuf[]; /* command line expression */
extern CONST char *error_table[E__COUNT+2]; /* calc coded error messages */ extern CONST char *error_table[E__COUNT+2]; /* calc coded error messages */
extern void matrandperm(MATRIX *M); extern void matrandperm(MATRIX *M);
@@ -4838,14 +4836,14 @@ strscan(char *s, int count, VALUE **vals)
while (*s != '\0') { while (*s != '\0') {
s--; s--;
while ((ch = *++s)) { while ((ch = *++s)) {
if (!isspace(ch)) if (!isspace((int)ch))
break; break;
} }
if (ch == '\0' || count-- == 0) if (ch == '\0' || count-- == 0)
return n; return n;
s0 = s; s0 = s;
while ((ch = *++s)) { while ((ch = *++s)) {
if (isspace(ch)) if (isspace((int)ch))
break; break;
} }
chtmp = ch; chtmp = ch;

5
have_const.c
View File

@@ -42,7 +42,7 @@
#include <stdio.h> #include <stdio.h>
MAIN int
main(void) main(void)
{ {
#if defined(HAVE_NO_CONST) #if defined(HAVE_NO_CONST)
@@ -56,5 +56,6 @@ main(void)
printf("#undef CONST\n"); printf("#undef CONST\n");
printf("#define CONST %s /* yes */\n", str); printf("#define CONST %s /* yes */\n", str);
#endif /* HAVE_NO_CONST */ #endif /* HAVE_NO_CONST */
exit(0); /* exit(0); */
return 0;
} }

5
have_fpos.c
View File

@@ -32,7 +32,7 @@
#include <stdio.h> #include <stdio.h>
MAIN int
main(void) main(void)
{ {
#if !defined(HAVE_NO_FPOS) #if !defined(HAVE_NO_FPOS)
@@ -49,5 +49,6 @@ main(void)
printf("#define HAVE_FPOS 1 /* yes */\n\n"); printf("#define HAVE_FPOS 1 /* yes */\n\n");
printf("typedef fpos_t FILEPOS;\n"); printf("typedef fpos_t FILEPOS;\n");
#endif #endif
exit(0); /* exit(0); */
return 0;
} }

5
have_memmv.c
View File

@@ -44,7 +44,7 @@
char src[] = "chongo was here"; char src[] = "chongo was here";
char dest[MOVELEN+1]; char dest[MOVELEN+1];
MAIN int
main(void) main(void)
{ {
#if defined(HAVE_NO_MEMMOVE) #if defined(HAVE_NO_MEMMOVE)
@@ -54,5 +54,6 @@ main(void)
printf("#define HAVE_MEMMOVE /* yes */\n"); printf("#define HAVE_MEMMOVE /* yes */\n");
#endif /* HAVE_NO_MEMMOVE */ #endif /* HAVE_NO_MEMMOVE */
exit(0); /* exit(0); */
return 0;
} }

5
have_newstr.c
View File

@@ -46,7 +46,7 @@
char src[] = "chongo was here"; char src[] = "chongo was here";
char dest[MOVELEN+1]; char dest[MOVELEN+1];
MAIN int
main(void) main(void)
{ {
#if defined(HAVE_NO_NEWSTR) #if defined(HAVE_NO_NEWSTR)
@@ -58,5 +58,6 @@ main(void)
printf("#define HAVE_NEWSTR /* yes */\n"); printf("#define HAVE_NEWSTR /* yes */\n");
#endif /* HAVE_NO_NEWSTR */ #endif /* HAVE_NO_NEWSTR */
exit(0); /* exit(0); */
return 0;
} }

5
have_offscl.c
View File

@@ -45,7 +45,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
MAIN int
main(void) main(void)
{ {
#if !defined(OFF_T_NON_SCALAR) #if !defined(OFF_T_NON_SCALAR)
@@ -79,5 +79,6 @@ main(void)
#else #else
printf("#undef HAVE_OFF_T_SCALAR /* off_t is not a simple value */\n"); printf("#undef HAVE_OFF_T_SCALAR /* off_t is not a simple value */\n");
#endif #endif
exit(0); /* exit(0); */
return 0;
} }

5
have_posscl.c
View File

@@ -46,7 +46,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "have_fpos.h" #include "have_fpos.h"
MAIN int
main(void) main(void)
{ {
#if !defined(FILEPOS_NON_SCALAR) #if !defined(FILEPOS_NON_SCALAR)
@@ -80,5 +80,6 @@ main(void)
#else #else
printf("#undef HAVE_FILEPOS_SCALAR /* FILEPOS is not a simple value */\n"); printf("#undef HAVE_FILEPOS_SCALAR /* FILEPOS is not a simple value */\n");
#endif #endif
exit(0); /* exit(0); */
return 0;
} }

8
have_stdvs.c
View File

@@ -68,7 +68,7 @@ try(char *fmt, ...)
} }
MAIN int
main(void) main(void)
{ {
/* /*
@@ -90,7 +90,8 @@ main(void)
} }
try("%s %d%s%d%d %s", try("%s %d%s%d%d %s",
"Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime"); "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
if (strcmp(buf, "Landon Noll 1st proved that 2^23209-1 was prime") != 0) { if (strcmp(buf,
"Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
#if !defined(DONT_HAVE_VSPRINTF) #if !defined(DONT_HAVE_VSPRINTF)
/* <stdarg.h> with vsprintf() didn't work */ /* <stdarg.h> with vsprintf() didn't work */
#else #else
@@ -135,5 +136,6 @@ main(void)
puts("#define vsprintf sprintf"); puts("#define vsprintf sprintf");
puts("#undef HAVE_VS"); puts("#undef HAVE_VS");
#endif #endif
exit(0); /* exit(0); */
return 0;
} }

5
have_uid_t.c
View File

@@ -47,7 +47,7 @@
#include <sys/types.h> #include <sys/types.h>
#endif /* ! HAVE_NO_UID_T */ #endif /* ! HAVE_NO_UID_T */
MAIN int
main(void) main(void)
{ {
#if defined(HAVE_NO_UID_T) #if defined(HAVE_NO_UID_T)
@@ -60,5 +60,6 @@ main(void)
printf("#define HAVE_UID_T /* yes */\n"); printf("#define HAVE_UID_T /* yes */\n");
#endif /* HAVE_NO_UID_T */ #endif /* HAVE_NO_UID_T */
exit(0); /* exit(0); */
return 0;
} }

8
have_varvs.c
View File

@@ -76,7 +76,7 @@ try(char *a, int b, char *c, int d)
#endif #endif
MAIN int
main(void) main(void)
{ {
/* /*
@@ -98,7 +98,8 @@ main(void)
} }
try("%s %d%s%d%d %s", try("%s %d%s%d%d %s",
"Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime"); "Landon Noll 1st proved that", 2, "^", 23209, -1, "was prime");
if (strcmp(buf, "Landon Noll 1st proved that 2^23209-1 was prime") != 0) { if (strcmp(buf,
"Landon Noll 1st proved that 2^23209-1 was prime") != 0) {
#if !defined(DONT_HAVE_VSPRINTF) #if !defined(DONT_HAVE_VSPRINTF)
/* <stdarg.h> with vsprintf() didn't work */ /* <stdarg.h> with vsprintf() didn't work */
#else #else
@@ -127,5 +128,6 @@ main(void)
puts("#define vsprintf sprintf"); puts("#define vsprintf sprintf");
puts("#undef HAVE_VS"); puts("#undef HAVE_VS");
#endif #endif
exit(0); /* exit(0); */
return 0;
} }

26
hist.c
View File

@@ -421,12 +421,12 @@ do_map_line(char *line)
char *map_name; char *map_name;
cp = line; cp = line;
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
if (*cp == '\0') if (*cp == '\0')
return NULL; return NULL;
map_name = cp; map_name = cp;
while ((*cp != '\0') && !isspace(*cp)) while ((*cp != '\0') && !isspace((int)*cp))
cp++; cp++;
*cp = '\0'; *cp = '\0';
return find_map(map_name); return find_map(map_name);
@@ -461,7 +461,7 @@ do_bind_line(KEY_MAP *map, char *line)
else if (key == '\\') else if (key == '\\')
key = *cp++; key = *cp++;
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
if (*cp == '\0') { if (*cp == '\0') {
unbind_key(map, key); unbind_key(map, key);
@@ -469,11 +469,11 @@ do_bind_line(KEY_MAP *map, char *line)
} }
func_name = cp; func_name = cp;
while ((*cp != '\0') && !isspace(*cp)) while ((*cp != '\0') && !isspace((int)*cp))
cp++; cp++;
if (*cp) { if (*cp) {
*cp++ = '\0'; *cp++ = '\0';
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
} }
func = find_func(func_name); func = find_func(func_name);
@@ -488,11 +488,11 @@ do_bind_line(KEY_MAP *map, char *line)
next = base_map; next = base_map;
} else { } else {
next_name = cp; next_name = cp;
while ((*cp != '\0') && !isspace(*cp)) while ((*cp != '\0') && !isspace((int)*cp))
cp++; cp++;
if (*cp) { if (*cp) {
*cp++ = '\0'; *cp++ = '\0';
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
} }
next = find_map(next_name); next = find_map(next_name);
@@ -515,18 +515,18 @@ do_default_line(KEY_MAP *map, char *line)
if (map == NULL) if (map == NULL)
return; return;
cp = line; cp = line;
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
if (*cp == '\0') if (*cp == '\0')
return; return;
func_name = cp; func_name = cp;
while ((*cp != '\0') && !isspace(*cp)) while ((*cp != '\0') && !isspace((int)*cp))
cp++; cp++;
if (*cp != '\0') if (*cp != '\0')
{ {
*cp++ = '\0'; *cp++ = '\0';
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
} }
func = find_func(func_name); func = find_func(func_name);
@@ -538,12 +538,12 @@ do_default_line(KEY_MAP *map, char *line)
else else
{ {
next_name = cp; next_name = cp;
while ((*cp != '\0') && !isspace(*cp)) while ((*cp != '\0') && !isspace((int)*cp))
cp++; cp++;
if (*cp != '\0') if (*cp != '\0')
{ {
*cp++ = '\0'; *cp++ = '\0';
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
} }
next = find_map(next_name); next = find_map(next_name);
@@ -577,7 +577,7 @@ read_bindings(FILE *fp)
while (fgets(line, sizeof(line) - 1, fp)) { while (fgets(line, sizeof(line) - 1, fp)) {
cp = line; cp = line;
while (isspace(*cp)) while (isspace((int)*cp))
cp++; cp++;
if ((*cp == '\0') || (*cp == '#') || (*cp == '\n')) if ((*cp == '\0') || (*cp == '#') || (*cp == '\n'))

7
longbits.c
View File

@@ -105,7 +105,7 @@
char *program; /* our name */ char *program; /* our name */
MAIN int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int exitcode = 0; /* how we will exit */ int exitcode = 0; /* how we will exit */
@@ -124,7 +124,7 @@ main(int argc, char **argv)
case 2: case 2:
/* ignore empty or leading space args */ /* ignore empty or leading space args */
if (argv[1][0] == '\0' || if (argv[1][0] == '\0' ||
(isascii(argv[1][0]) && isspace(argv[1][0]))) { (isascii((int)argv[1][0]) && isspace((int)argv[1][0]))) {
long_bits = sizeof(long)*8; long_bits = sizeof(long)*8;
/* process the forced size arg */ /* process the forced size arg */
} else { } else {
@@ -362,5 +362,6 @@ main(int argc, char **argv)
} }
/* all done */ /* all done */
exit(exitcode); /* exit(exitcode); */
return exitcode;
} }

5
longlong.c
View File

@@ -66,7 +66,7 @@ unsigned long long val = 4294967297ULL;
long long val2 = -4294967297LL; long long val2 = -4294967297LL;
MAIN int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int longlong_bits; /* bits in a long long, or <=0 => dont use */ int longlong_bits; /* bits in a long long, or <=0 => dont use */
@@ -100,5 +100,6 @@ main(int argc, char **argv)
longlong_bits); longlong_bits);
} }
} }
exit(0); /* exit(0); */
return 0;
} }

14
sample/Makefile
View File

@@ -95,18 +95,6 @@ TOPDIR= /usr/local/lib
LIBDIR= ${TOPDIR}/calc LIBDIR= ${TOPDIR}/calc
HELPDIR= ${LIBDIR}/help HELPDIR= ${LIBDIR}/help
# The return value type of main() differs from platform to platform.
# In some cases, a compiler warning is issued because main() does
# or does not return a value.
#
# MAIN= -DMAIN=void main() is of type void
# MAIN= -DMAIN=int main() is of type int
#
# When in doubt, try MAIN= -DMAIN=void. If you get a warning try the other.
#
MAIN= -DMAIN=void
#MAIN= -DMAIN=int
# Normally, the upper level makefile will set these values. We provide # Normally, the upper level makefile will set these values. We provide
# a default here just in case you want to build from this directory. # a default here just in case you want to build from this directory.
# #
@@ -251,7 +239,7 @@ CCMISC=
CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} ${ALLOW_CUSTOM} CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} ${ALLOW_CUSTOM}
ICFLAGS= ${CCWARN} ${CCMISC} ICFLAGS= ${CCWARN} ${CCMISC}
# #
CCMAIN= ${ICFLAGS} ${MAIN} CCMAIN= ${ICFLAGS}
# #
LCFLAGS= LCFLAGS=
LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}

5
sample/many_random.c
View File

@@ -59,7 +59,7 @@ typedef struct {
extern char *program; /* our name */ extern char *program; /* our name */
MAIN int
main(int argc, char **argv) main(int argc, char **argv)
{ {
RANDOM *prev_state; /* previous random number state */ RANDOM *prev_state; /* previous random number state */
@@ -176,5 +176,6 @@ main(int argc, char **argv)
/* /*
* all done * all done
*/ */
exit(0); /* exit(0); */
return 0;
} }

5
sample/test_random.c
View File

@@ -57,7 +57,7 @@ typedef struct {
extern char *program; /* our name */ extern char *program; /* our name */
MAIN int
main(int argc, char **argv) main(int argc, char **argv)
{ {
RANDOM *prev_state; /* previous random number state */ RANDOM *prev_state; /* previous random number state */
@@ -121,5 +121,6 @@ main(int argc, char **argv)
/* /*
* all done * all done
*/ */
exit(0); /* exit(0); */
return 0;
} }

2
version.c
View File

@@ -12,7 +12,7 @@
#define MAJOR_VER 2 /* major version */ #define MAJOR_VER 2 /* major version */
#define MINOR_VER 11 /* minor version */ #define MINOR_VER 11 /* minor version */
#define MAJOR_PATCH 0 /* patch level or 0 if no patch */ #define MAJOR_PATCH 0 /* patch level or 0 if no patch */
#define MINOR_PATCH "0" /* test number or empty string if no patch */ #define MINOR_PATCH "1" /* test number or empty string if no patch */
/* /*
* calc version constants * calc version constants