From: eck Date: Mon, 29 Jan 1990 10:09:00 +0000 (+0000) Subject: formal parameters in prototyps need only 1 underscore X-Git-Tag: release-5-5~1860 X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=343dbb810ffa92e9cfec0504ccf94cfd64798d85;p=ack.git formal parameters in prototyps need only 1 underscore --- diff --git a/lang/cem/libcc.ansi/headers/assert.h b/lang/cem/libcc.ansi/headers/assert.h index a893eebee..6f963cb6d 100644 --- a/lang/cem/libcc.ansi/headers/assert.h +++ b/lang/cem/libcc.ansi/headers/assert.h @@ -6,7 +6,7 @@ */ /* $Header$ */ -void __bad_assertion(const char *__expr, const char *__file, int __line); +void __bad_assertion(const char *_expr, const char *_file, int _line); #undef assert diff --git a/lang/cem/libcc.ansi/headers/ctype.h b/lang/cem/libcc.ansi/headers/ctype.h index 925126148..cf38d6228 100644 --- a/lang/cem/libcc.ansi/headers/ctype.h +++ b/lang/cem/libcc.ansi/headers/ctype.h @@ -17,19 +17,19 @@ extern int __x; /* scratch variable */ #define _C 0x20 /* this bit is for control characters */ #define _X 0x40 /* this bit is for hex digits [a-f] and [A-F]*/ -int isalnum(int __c); /* alphanumeric [a-z], [A-Z], [0-9] */ -int isalpha(int __c); /* alphabetic */ -int iscntrl(int __c); /* control characters */ -int isdigit(int __c); /* digit [0-9] */ -int isgraph(int __c); /* graphic character */ -int islower(int __c); /* lower-case letter [a-z] */ -int isprint(int __c); /* printable character */ -int ispunct(int __c); /* punctuation mark */ -int isspace(int __c); /* white space sp, \f, \n, \r, \t, \v */ -int isupper(int __c); /* upper-case letter [A-Z] */ -int isxdigit(int __c); /* hex digit [0-9], [a-f], [A-F] */ -int tolower(int __c); /* convert to lower case character */ -int toupper(int __c); /* convert to upper case character */ +int isalnum(int _c); /* alphanumeric [a-z], [A-Z], [0-9] */ +int isalpha(int _c); /* alphabetic */ +int iscntrl(int _c); /* control characters */ +int isdigit(int _c); /* digit [0-9] */ +int isgraph(int _c); /* graphic character */ +int islower(int _c); /* lower-case letter [a-z] */ +int isprint(int _c); /* printable character */ +int ispunct(int _c); /* punctuation mark */ +int isspace(int _c); /* white space sp, \f, \n, \r, \t, \v */ +int isupper(int _c); /* upper-case letter [A-Z] */ +int isxdigit(int _c); /* hex digit [0-9], [a-f], [A-F] */ +int tolower(int _c); /* convert to lower case character */ +int toupper(int _c); /* convert to upper case character */ #define isalpha(c) ((__ctype+1)[c]&(_U|_L)) #define isspace(c) ((__ctype+1)[c]&_S) diff --git a/lang/cem/libcc.ansi/headers/dirent.h b/lang/cem/libcc.ansi/headers/dirent.h index 42e4b1b19..d0801ecaa 100644 --- a/lang/cem/libcc.ansi/headers/dirent.h +++ b/lang/cem/libcc.ansi/headers/dirent.h @@ -22,12 +22,12 @@ typedef struct char *dd_buf; /* -> directory block */ } DIR; /* stream data from opendir() */ -DIR *opendir(const char *__dirname); -struct dirent *readdir(DIR *__dirp); -void rewinddir(DIR *__dirp); -int closedir(DIR *__dirp); -off_t telldir(DIR *__dirp); -void seekdir(DIR *__dirp, off_t __loc); +DIR *opendir(const char *_dirname); +struct dirent *readdir(DIR *_dirp); +void rewinddir(DIR *_dirp); +int closedir(DIR *_dirp); +off_t telldir(DIR *_dirp); +void seekdir(DIR *_dirp, off_t _loc); #define NULL ((void *)0) /* DAG -- added for convenience */ diff --git a/lang/cem/libcc.ansi/headers/grp.h b/lang/cem/libcc.ansi/headers/grp.h index 6d9d6939b..243de1e51 100644 --- a/lang/cem/libcc.ansi/headers/grp.h +++ b/lang/cem/libcc.ansi/headers/grp.h @@ -15,7 +15,7 @@ struct group { /* see getgrent(3) */ }; struct group *getgrent(void); -struct group *getgrgid(int __gid); -struct group *getgrnam(const char *__name); +struct group *getgrgid(int _gid); +struct group *getgrnam(const char *_name); #endif /* _GRP_H */ diff --git a/lang/cem/libcc.ansi/headers/locale.h b/lang/cem/libcc.ansi/headers/locale.h index e50e30560..88d4a093e 100644 --- a/lang/cem/libcc.ansi/headers/locale.h +++ b/lang/cem/libcc.ansi/headers/locale.h @@ -37,7 +37,7 @@ struct lconv { #define LC_TIME 6 -char *setlocale(int __category, const char *__locale); -struct lconv *localeconv(void); +char *setlocale(int _category, const char *_locale); +struct lconv *localeconv(void); #endif /* _LOCALE_H */ diff --git a/lang/cem/libcc.ansi/headers/math.h b/lang/cem/libcc.ansi/headers/math.h index a724933d5..04ca45343 100644 --- a/lang/cem/libcc.ansi/headers/math.h +++ b/lang/cem/libcc.ansi/headers/math.h @@ -8,33 +8,33 @@ #define HUGE_VAL 9.9e+999 /* though it will generate a warning */ -double acos(double __x); -double asin(double __x); -double atan(double __x); -double atan2(double __y, double __x); - -double cos(double __x); -double sin(double __x); -double tan(double __x); - -double cosh(double __x); -double sinh(double __x); -double tanh(double __x); - -double exp(double __x); -double log(double __x); -double log10(double __x); - -double sqrt(double __x); -double ceil(double __x); -double fabs(double __x); -double floor(double __x); - -double pow(double __x, double __y); - -double frexp(double __x, int *__exp); -double ldexp(double __x, int __exp); -double modf(double __x, double *__iptr); -double fmod(double __x, double __y); +double acos(double _x); +double asin(double _x); +double atan(double _x); +double atan2(double _y, double _x); + +double cos(double _x); +double sin(double _x); +double tan(double _x); + +double cosh(double _x); +double sinh(double _x); +double tanh(double _x); + +double exp(double _x); +double log(double _x); +double log10(double _x); + +double sqrt(double _x); +double ceil(double _x); +double fabs(double _x); +double floor(double _x); + +double pow(double _x, double _y); + +double frexp(double _x, int *_exp); +double ldexp(double _x, int _exp); +double modf(double _x, double *_iptr); +double fmod(double _x, double _y); #endif /* _MATH_H */ diff --git a/lang/cem/libcc.ansi/headers/setjmp.h b/lang/cem/libcc.ansi/headers/setjmp.h index d5b636f2a..804c91b39 100644 --- a/lang/cem/libcc.ansi/headers/setjmp.h +++ b/lang/cem/libcc.ansi/headers/setjmp.h @@ -18,15 +18,15 @@ typedef char jmp_buf[ sizeof(long) + sizeof(int) + 3 * sizeof(void *)]; -int __setjmp(jmp_buf __env, int __savemask); +int __setjmp(jmp_buf _env, int _savemask); #define setjmp(env) __setjmp(env, 0) -void longjmp(jmp_buf __env, int __val); +void longjmp(jmp_buf _env, int _val); #if defined(_POSIX_SOURCE) typedef jmp_buf sigjmp_buf; #define sigsetjmp(env, savemask) __setjmp(env, savemask) -int siglongjmp(sigjmp_buf __env, int __val); +int siglongjmp(sigjmp_buf _env, int _val); #endif #endif /* _SETJMP_H */ diff --git a/lang/cem/libcc.ansi/headers/signal.h b/lang/cem/libcc.ansi/headers/signal.h index f4c226c20..3d06f4000 100644 --- a/lang/cem/libcc.ansi/headers/signal.h +++ b/lang/cem/libcc.ansi/headers/signal.h @@ -91,7 +91,7 @@ struct sigaction { #define _NSIG 16 #endif /* __USG or __BSD4_2 */ -void (*signal(int __sig, void (*__func)(int)))(int); -int raise(int __sig); +void (*signal(int _sig, void (*_func)(int)))(int); +int raise(int _sig); #endif /* _SIGNAL_H */ diff --git a/lang/cem/libcc.ansi/headers/stdio.h b/lang/cem/libcc.ansi/headers/stdio.h index f5535573b..a31d7c58b 100644 --- a/lang/cem/libcc.ansi/headers/stdio.h +++ b/lang/cem/libcc.ansi/headers/stdio.h @@ -73,50 +73,50 @@ typedef unsigned long size_t; /* type returned by sizeof */ extern FILE *__iotab[FOPEN_MAX]; extern FILE __stdin, __stdout, __stderr; -int remove(const char *__filename); -int rename(const char *__old, const char *__new); +int remove(const char *_filename); +int rename(const char *_old, const char *_new); FILE *tmpfile(void); -char *tmpnam(char *__s); -int fclose(FILE *__stream); -int fflush(FILE *__stream); -FILE *fopen(const char *__filename, const char *__mode); -FILE *freopen(const char *__filename, const char *__mode, FILE *__stream); -void setbuf(FILE *__stream, char *__buf); -int setvbuf(FILE *__stream, char *__buf, int __mode, size_t __size); -int fprintf(FILE *__stream, const char *__format, ...); -int fscanf(FILE *__stream, const char *__format, ...); -int printf(const char *__format, ...); -int scanf(const char *__format, ...); -int sprintf(char *__s, const char *__format, ...); -int sscanf(char *__s, const char *__format, ...); -int vfprintf(FILE *__stream, const char *__format, char *__arg); -int vprintf(const char *__format, char *__arg); -int vsprintf(char *__s, const char *__format, char *__arg); -int fgetc(FILE *__stream); -char *fgets(char *__s, int __n, FILE *__stream); -int fputc(int __c, FILE *__stream); -int fputs(const char *__s, FILE *__stream); -int getc(FILE *__stream); +char *tmpnam(char *_s); +int fclose(FILE *_stream); +int fflush(FILE *_stream); +FILE *fopen(const char *_filename, const char *_mode); +FILE *freopen(const char *_filename, const char *_mode, FILE *_stream); +void setbuf(FILE *_stream, char *_buf); +int setvbuf(FILE *_stream, char *_buf, int _mode, size_t _size); +int fprintf(FILE *_stream, const char *_format, ...); +int fscanf(FILE *_stream, const char *_format, ...); +int printf(const char *_format, ...); +int scanf(const char *_format, ...); +int sprintf(char *_s, const char *_format, ...); +int sscanf(char *_s, const char *_format, ...); +int vfprintf(FILE *_stream, const char *_format, char *_arg); +int vprintf(const char *_format, char *_arg); +int vsprintf(char *_s, const char *_format, char *_arg); +int fgetc(FILE *_stream); +char *fgets(char *_s, int _n, FILE *_stream); +int fputc(int _c, FILE *_stream); +int fputs(const char *_s, FILE *_stream); +int getc(FILE *_stream); int getchar(void); -char *gets(char *__s); -int putc(int __c, FILE *__stream); -int putchar(int __c); -int puts(const char *__s); -int ungetc(int __c, FILE *__stream); -size_t fread(void *__ptr, size_t __size, size_t __nmemb, FILE *__stream); -size_t fwrite(const void *__ptr, size_t __size, size_t __nmemb, FILE *__stream); -int fgetpos(FILE *__stream, fpos_t *__pos); -int fseek(FILE *__stream, long __offset, int __whence); -int fsetpos(FILE *__stream, fpos_t *__pos); -long ftell(FILE *__stream); -void rewind(FILE *__stream); -void clearerr(FILE *__stream); -int feof(FILE *__stream); -int ferror(FILE *__stream); -void perror(const char *__s); - -int __fillbuf(FILE *__stream); -int __flushbuf(int __c, FILE *__stream); +char *gets(char *_s); +int putc(int _c, FILE *_stream); +int putchar(int _c); +int puts(const char *_s); +int ungetc(int _c, FILE *_stream); +size_t fread(void *_ptr, size_t _size, size_t _nmemb, FILE *_stream); +size_t fwrite(const void *_ptr, size_t _size, size_t _nmemb, FILE *_stream); +int fgetpos(FILE *_stream, fpos_t *_pos); +int fseek(FILE *_stream, long _offset, int _whence); +int fsetpos(FILE *_stream, fpos_t *_pos); +long ftell(FILE *_stream); +void rewind(FILE *_stream); +void clearerr(FILE *_stream); +int feof(FILE *_stream); +int ferror(FILE *_stream); +void perror(const char *_s); + +int __fillbuf(FILE *_stream); +int __flushbuf(int _c, FILE *_stream); #define getchar() getc(stdin) @@ -131,7 +131,7 @@ int __flushbuf(int __c, FILE *__stream); #define ferror(p) (((p)->_flags & _IOERR) != 0) #if defined(__BSD4_2) || defined(__USG) || defined(_POSIX_SOURCE) -int fileno(FILE *__stream); +int fileno(FILE *_stream); #define fileno(stream) ((stream)->_fd) #endif /* __BSD4_2 || __USG || _POSIX_SOURCE */ diff --git a/lang/cem/libcc.ansi/headers/stdlib.h b/lang/cem/libcc.ansi/headers/stdlib.h index b7afa37c2..49481c22b 100644 --- a/lang/cem/libcc.ansi/headers/stdlib.h +++ b/lang/cem/libcc.ansi/headers/stdlib.h @@ -33,36 +33,36 @@ typedef unsigned long size_t; /* type returned by sizeof */ typedef char wchar_t; #endif /* _WCHAR_T */ -double atof(const char *__nptr); -int atoi(const char *__nptr); -long atol(const char *__nptr); -double strtod(const char *__nptr, char **__endptr); -long strtol(const char *__nptr, char **__endptr, int __base); -unsigned long int strtoul(const char *__nptr, char **__endptr, int __base); +double atof(const char *_nptr); +int atoi(const char *_nptr); +long atol(const char *_nptr); +double strtod(const char *_nptr, char **_endptr); +long strtol(const char *_nptr, char **_endptr, int _base); +unsigned long int strtoul(const char *_nptr, char **_endptr, int _base); int rand(void); -void srand(unsigned int __seed); -void *calloc(size_t __nmemb, size_t __size); -void free(void *__ptr); -void *malloc(size_t __size); -void *realloc(void *__ptr, size_t __size); +void srand(unsigned int _seed); +void *calloc(size_t _nmemb, size_t _size); +void free(void *_ptr); +void *malloc(size_t _size); +void *realloc(void *_ptr, size_t _size); void abort(void); -int atexit(void (*__func)(void)); -void exit(int __status); -char *getenv(const char *__name); -int system(const char *__string); -void *bsearch(const void *__key, const void *__base, - size_t __nmemb, size_t __size, - int (*__compar)(const void *, const void *)); -void qsort(void *__base, size_t __nmemb, size_t __size, - int (*__compar)(const void *, const void *)); -int abs(int __j); -div_t div(int __numer, int __denom); -long labs(long __j); -ldiv_t ldiv(long __numer, long __denom); -int mblen(const char *__s, size_t __n); -int mbtowc(wchar_t *__pwc, const char *__s, size_t __n); -int wctomb(char *__s, wchar_t __wchar); -size_t mbstowcs(wchar_t *__pwcs, const char *__s, size_t __n); -size_t wcstombs(char *__s, const wchar_t *__pwcs, size_t __n); +int atexit(void (*_func)(void)); +void exit(int _status); +char *getenv(const char *_name); +int system(const char *_string); +void *bsearch(const void *_key, const void *_base, + size_t _nmemb, size_t _size, + int (*_compar)(const void *, const void *)); +void qsort(void *_base, size_t _nmemb, size_t _size, + int (*_compar)(const void *, const void *)); +int abs(int _j); +div_t div(int _numer, int _denom); +long labs(long _j); +ldiv_t ldiv(long _numer, long _denom); +int mblen(const char *_s, size_t _n); +int mbtowc(wchar_t *_pwc, const char *_s, size_t _n); +int wctomb(char *_s, wchar_t _wchar); +size_t mbstowcs(wchar_t *_pwcs, const char *_s, size_t _n); +size_t wcstombs(char *_s, const wchar_t *_pwcs, size_t _n); #endif /* _STDLIB_H */ diff --git a/lang/cem/libcc.ansi/headers/string.h b/lang/cem/libcc.ansi/headers/string.h index ef234f5e2..1e26d4857 100644 --- a/lang/cem/libcc.ansi/headers/string.h +++ b/lang/cem/libcc.ansi/headers/string.h @@ -20,27 +20,27 @@ typedef unsigned long size_t; /* type returned by sizeof */ #endif #endif /* _SIZE_T */ -void *memcpy(void *__s1, const void *__s2, size_t __n); -void *memmove(void *__s1, const void *__s2, size_t __n); -char *strcpy(char *__s1, const char *__s2); -char *strncpy(char *__s1, const char *__s2, size_t __n); -char *strcat(char *__s1, const char *__s2); -char *strncat(char *__s1, const char *__s2, size_t __n); -int memcmp(const void *__s1, const void *__s2, size_t __n); -int strcmp(const char *__s1, const char *__s2); -int strcoll(const char *__s1, const char *__s2); -int strncmp(const char *__s1, const char *__s2, size_t __n); -size_t strxfrm(char *__s1, const char *__s2, size_t __n); -void *memchr(const void *__s, int __c, size_t __n); -char *strchr(const char *__s, int __c); -size_t strcspn(const char *__s1, const char *__s2); -char *strpbrk(const char *__s1, const char *__s2); -char *strrchr(const char *__s, int __c); -size_t strspn(const char *__s1, const char *__s2); -char *strstr(const char *__s1, const char *__s2); -char *strtok(char *__s1, const char *__s2); -void *memset(void *__s, int __c, size_t __n); -char *strerror(int __errnum); -size_t strlen(const char *__s); +void *memcpy(void *_s1, const void *_s2, size_t _n); +void *memmove(void *_s1, const void *_s2, size_t _n); +char *strcpy(char *_s1, const char *_s2); +char *strncpy(char *_s1, const char *_s2, size_t _n); +char *strcat(char *_s1, const char *_s2); +char *strncat(char *_s1, const char *_s2, size_t _n); +int memcmp(const void *_s1, const void *_s2, size_t _n); +int strcmp(const char *_s1, const char *_s2); +int strcoll(const char *_s1, const char *_s2); +int strncmp(const char *_s1, const char *_s2, size_t _n); +size_t strxfrm(char *_s1, const char *_s2, size_t _n); +void *memchr(const void *_s, int _c, size_t _n); +char *strchr(const char *_s, int _c); +size_t strcspn(const char *_s1, const char *_s2); +char *strpbrk(const char *_s1, const char *_s2); +char *strrchr(const char *_s, int _c); +size_t strspn(const char *_s1, const char *_s2); +char *strstr(const char *_s1, const char *_s2); +char *strtok(char *_s1, const char *_s2); +void *memset(void *_s, int _c, size_t _n); +char *strerror(int _errnum); +size_t strlen(const char *_s); #endif /* _STRING_H */ diff --git a/lang/cem/libcc.ansi/headers/time.h b/lang/cem/libcc.ansi/headers/time.h index b184634a7..1d1855d21 100644 --- a/lang/cem/libcc.ansi/headers/time.h +++ b/lang/cem/libcc.ansi/headers/time.h @@ -43,16 +43,16 @@ struct tm { }; clock_t clock(void); -double difftime(time_t __time1, time_t __time0); -time_t mktime(struct tm *__timeptr); -time_t time(time_t *__timeptr); -char *asctime(const struct tm *__timeptr); -char *ctime(const time_t *__timer); -struct tm *gmtime(const time_t *__timer); -struct tm *localtime(const time_t *__timer); -size_t strftime(char *__s, size_t __maxsize, - const char *__format, - const struct tm *__timeptr); +double difftime(time_t _time1, time_t _time0); +time_t mktime(struct tm *_timeptr); +time_t time(time_t *_timeptr); +char *asctime(const struct tm *_timeptr); +char *ctime(const time_t *_timer); +struct tm *gmtime(const time_t *_timer); +struct tm *localtime(const time_t *_timer); +size_t strftime(char *_s, size_t _maxsize, + const char *_format, + const struct tm *_timeptr); #if defined(__USG) || defined(_POSIX_SOURCE)