ansification: remove _AND
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
This commit is contained in:
Yaakov Selkowitz
parent
1e39db3062
commit
6783860a2e
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
* isatty -- returns 1 if connected to a terminal device,
|
||||
* returns 0 if not. Since we're hooked up to a
|
||||
* serial port, we'll say yes _AND return a 1.
|
||||
* serial port, we'll say yes and return a 1.
|
||||
*/
|
||||
int
|
||||
_DEFUN (_isatty, (fd),
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
|
|||
*/
|
||||
int
|
||||
_DEFUN (_kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
* isatty -- returns 1 if connected to a terminal device,
|
||||
* returns 0 if not. Since we're hooked up to a
|
||||
* serial port, we'll say yes _AND return a 1.
|
||||
* serial port, we'll say yes and return a 1.
|
||||
*/
|
||||
int
|
||||
_DEFUN (isatty, (fd),
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
* isatty -- returns 1 if connected to a terminal device,
|
||||
* returns 0 if not. Since we're hooked up to a
|
||||
* serial port, we'll say yes _AND return a 1.
|
||||
* serial port, we'll say yes and return a 1.
|
||||
*/
|
||||
int
|
||||
_DEFUN (_isatty, (fd),
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
|
|||
*/
|
||||
int
|
||||
_DEFUN (_kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ _DEFUN (_times, _times (buf),
|
|||
*/
|
||||
int
|
||||
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
|
||||
struct timeval *tv _AND
|
||||
struct timeval *tv,
|
||||
void *tzvp)
|
||||
{
|
||||
struct timezone *tz = tzvp;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
* isatty -- returns 1 if connected to a terminal device,
|
||||
* returns 0 if not. Since we're hooked up to a
|
||||
* serial port, we'll say yes _AND return a 1.
|
||||
* serial port, we'll say yes and return a 1.
|
||||
*/
|
||||
int
|
||||
_DEFUN (_isatty, (fd),
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
|
|||
*/
|
||||
int
|
||||
_DEFUN (_kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
off_t
|
||||
_DEFUN (_lseek, (fd, offset, whence),
|
||||
int fd _AND
|
||||
off_t offset _AND
|
||||
int fd,
|
||||
off_t offset,
|
||||
int whence)
|
||||
{
|
||||
errno = ESPIPE;
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
off_t
|
||||
_DEFUN (_lseek, (fd, offset, whence),
|
||||
int fd _AND
|
||||
off_t offset _AND
|
||||
int fd,
|
||||
off_t offset,
|
||||
int whence)
|
||||
{
|
||||
/* errno = ESPIPE; */
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ _DEFUN (_times, _times (buf),
|
|||
*/
|
||||
int
|
||||
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
|
||||
struct timeval *tv _AND
|
||||
struct timeval *tv,
|
||||
void *tzvp)
|
||||
{
|
||||
struct timezone *tz = tzvp;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
* isatty -- returns 1 if connected to a terminal device,
|
||||
* returns 0 if not. Since we're hooked up to a
|
||||
* serial port, we'll say yes _AND return a 1.
|
||||
* serial port, we'll say yes, return a 1.
|
||||
*/
|
||||
int
|
||||
_DEFUN (isatty, (fd),
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_chown, (path, owner, group),
|
||||
const char *path _AND
|
||||
uid_t owner _AND
|
||||
const char *path,
|
||||
uid_t owner,
|
||||
gid_t group)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_execve, (name, argv, env),
|
||||
char *name _AND
|
||||
char **argv _AND
|
||||
char *name,
|
||||
char **argv,
|
||||
char **env)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_fstat, (fildes, st),
|
||||
int fildes _AND
|
||||
int fildes,
|
||||
struct stat *st)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ struct timeval;
|
|||
|
||||
int
|
||||
_DEFUN (_gettimeofday, (ptimeval, ptimezone),
|
||||
struct timeval *ptimeval _AND
|
||||
struct timeval *ptimeval,
|
||||
void *ptimezone)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_link, (existing, new),
|
||||
char *existing _AND
|
||||
char *existing,
|
||||
char *new)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_lseek, (file, ptr, dir),
|
||||
int file _AND
|
||||
int ptr _AND
|
||||
int file,
|
||||
int ptr,
|
||||
int dir)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_open, (file, flags, mode),
|
||||
char *file _AND
|
||||
int flags _AND
|
||||
char *file,
|
||||
int flags,
|
||||
int mode)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_read, (file, ptr, len),
|
||||
int file _AND
|
||||
char *ptr _AND
|
||||
int file,
|
||||
char *ptr,
|
||||
int len)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_readlink, (path, buf, bufsize),
|
||||
const char *path _AND
|
||||
char *buf _AND
|
||||
const char *path,
|
||||
char *buf,
|
||||
size_t bufsize)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_stat, (file, st),
|
||||
const char *file _AND
|
||||
const char *file,
|
||||
struct stat *st)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_symlink, (path1, path2),
|
||||
const char *path1 _AND
|
||||
const char *path1,
|
||||
const char *path2)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ extern int errno;
|
|||
|
||||
int
|
||||
_DEFUN (_write, (file, ptr, len),
|
||||
int file _AND
|
||||
char *ptr _AND
|
||||
int file,
|
||||
char *ptr,
|
||||
int len)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
*/
|
||||
off_t
|
||||
_DEFUN (lseek, (fd, offset, whence),
|
||||
int fd _AND
|
||||
off_t offset _AND
|
||||
int fd,
|
||||
off_t offset,
|
||||
int whence)
|
||||
{
|
||||
errno = ESPIPE;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
*/
|
||||
off_t
|
||||
_DEFUN (_lseek, (fd, offset, whence),
|
||||
int fd _AND
|
||||
off_t offset _AND
|
||||
int fd,
|
||||
off_t offset,
|
||||
int whence)
|
||||
{
|
||||
errno = ESPIPE;
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_open, (buf, flags, mode),
|
||||
const char *buf _AND
|
||||
int flags _AND
|
||||
const char *buf,
|
||||
int flags,
|
||||
int mode)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
|
|||
*/
|
||||
int
|
||||
_DEFUN (_read, (fd, buf, nbytes),
|
||||
int fd _AND
|
||||
char *buf _AND
|
||||
int fd,
|
||||
char *buf,
|
||||
int nbytes)
|
||||
{
|
||||
int i = 0;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ extern int _EXFUN (outbyte, (char x));
|
|||
*/
|
||||
int
|
||||
_DEFUN (_write, (fd, buf, nbytes),
|
||||
int fd _AND
|
||||
char *buf _AND
|
||||
int fd,
|
||||
char *buf,
|
||||
int nbytes)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
* isatty -- returns 1 if connected to a terminal device,
|
||||
* returns 0 if not. Since we're hooked up to a
|
||||
* serial port, we'll say yes _AND return a 1.
|
||||
* serial port, we'll say yes and return a 1.
|
||||
*/
|
||||
int
|
||||
_DEFUN (_isatty, (fd),
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
|
|||
*/
|
||||
int
|
||||
_DEFUN (_kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ _DEFUN (time, time (t),
|
|||
*/
|
||||
int
|
||||
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
|
||||
struct timeval *tv _AND
|
||||
struct timeval *tv,
|
||||
void *tzvp)
|
||||
{
|
||||
struct timezone *tz = tzvp;
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
off_t
|
||||
_DEFUN (_lseek, (fd, offset, whence),
|
||||
int fd _AND
|
||||
off_t offset _AND
|
||||
int fd,
|
||||
off_t offset,
|
||||
int whence)
|
||||
{
|
||||
errno = ESPIPE;
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
off_t
|
||||
_DEFUN (_lseek, (fd, offset, whence),
|
||||
int fd _AND
|
||||
off_t offset _AND
|
||||
int fd,
|
||||
off_t offset,
|
||||
int whence)
|
||||
{
|
||||
/* errno = ESPIPE; */
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ _DEFUN (_times, _times (buf),
|
|||
*/
|
||||
int
|
||||
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
|
||||
struct timeval *tv _AND
|
||||
struct timeval *tv,
|
||||
void *tzvp)
|
||||
{
|
||||
struct timezone *tz = tzvp;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (open, (buf, flags, mode),
|
||||
const char *buf _AND
|
||||
int flags _AND
|
||||
const char *buf,
|
||||
int flags,
|
||||
int mode)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
|
|||
*/
|
||||
int
|
||||
_DEFUN (read, (fd, buf, nbytes),
|
||||
int fd _AND
|
||||
char *buf _AND
|
||||
int fd,
|
||||
char *buf,
|
||||
int nbytes)
|
||||
{
|
||||
int i = 0;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ extern int _EXFUN (outbyte, (char x));
|
|||
*/
|
||||
int
|
||||
_DEFUN (write, (fd, buf, nbytes),
|
||||
int fd _AND
|
||||
char *buf _AND
|
||||
int fd,
|
||||
char *buf,
|
||||
int nbytes)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ int _DEFUN(_getpid,(),)
|
|||
}
|
||||
|
||||
int _DEFUN(_kill,(pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
errno = ENOSYS;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_fstat, (fd, buf),
|
||||
int fd _AND
|
||||
int fd,
|
||||
struct stat *buf)
|
||||
{
|
||||
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
/*
|
||||
* isatty -- returns 1 if connected to a terminal device,
|
||||
* returns 0 if not. Since we're hooked up to a
|
||||
* serial port, we'll say yes _AND return a 1.
|
||||
* serial port, we'll say yes and return a 1.
|
||||
*/
|
||||
int
|
||||
_DEFUN (_isatty, (fd),
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_kill, (pid, sig),
|
||||
int pid _AND
|
||||
int pid,
|
||||
int sig)
|
||||
{
|
||||
if(pid == __MYPID)
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
*/
|
||||
off_t
|
||||
_DEFUN (_lseek, (fd, offset, whence),
|
||||
int fd _AND
|
||||
off_t offset _AND
|
||||
int fd,
|
||||
off_t offset,
|
||||
int whence)
|
||||
{
|
||||
errno = ESPIPE;
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_open, (buf, flags, mode),
|
||||
const char *buf _AND
|
||||
int flags _AND
|
||||
const char *buf,
|
||||
int flags,
|
||||
int mode)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
int
|
||||
_DEFUN (_stat, (path, buf),
|
||||
const char *path _AND
|
||||
const char *path,
|
||||
struct stat *buf)
|
||||
{
|
||||
errno = EIO;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_add, (argz, argz_len, str),
|
||||
char **argz _AND
|
||||
size_t *argz_len _AND
|
||||
char **argz,
|
||||
size_t *argz_len,
|
||||
const char *str)
|
||||
{
|
||||
int len_to_add = 0;
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_add_sep, (argz, argz_len, str, sep),
|
||||
char **argz _AND
|
||||
size_t *argz_len _AND
|
||||
const char *str _AND
|
||||
char **argz,
|
||||
size_t *argz_len,
|
||||
const char *str,
|
||||
int sep)
|
||||
{
|
||||
char *str_argz = 0;
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_append, (argz, argz_len, buf, buf_len),
|
||||
char **argz _AND
|
||||
size_t *argz_len _AND
|
||||
const char *buf _AND
|
||||
char **argz,
|
||||
size_t *argz_len,
|
||||
const char *buf,
|
||||
size_t buf_len)
|
||||
{
|
||||
if (buf_len)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
size_t
|
||||
_DEFUN (argz_count, (argz, argz_len),
|
||||
const char *argz _AND
|
||||
const char *argz,
|
||||
size_t argz_len)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_create, (argv, argz, argz_len),
|
||||
char *const argv[] _AND
|
||||
char **argz _AND
|
||||
char *const argv[],
|
||||
char **argz,
|
||||
size_t *argz_len)
|
||||
{
|
||||
int argc = 0;
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_create_sep, (string, sep, argz, argz_len),
|
||||
const char *string _AND
|
||||
int sep _AND
|
||||
char **argz _AND
|
||||
const char *string,
|
||||
int sep,
|
||||
char **argz,
|
||||
size_t *argz_len)
|
||||
{
|
||||
int len = 0;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_delete, (argz, argz_len, entry),
|
||||
char **argz _AND
|
||||
size_t *argz_len _AND
|
||||
char **argz,
|
||||
size_t *argz_len,
|
||||
char *entry)
|
||||
{
|
||||
int len = 0;
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
void
|
||||
_DEFUN (argz_extract, (argz, argz_len, argv),
|
||||
char *argz _AND
|
||||
size_t argz_len _AND
|
||||
char *argz,
|
||||
size_t argz_len,
|
||||
char **argv)
|
||||
{
|
||||
size_t i = 0;
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_insert, (argz, argz_len, before, entry),
|
||||
char **argz _AND
|
||||
size_t *argz_len _AND
|
||||
char *before _AND
|
||||
char **argz,
|
||||
size_t *argz_len,
|
||||
char *before,
|
||||
const char *entry)
|
||||
{
|
||||
int len = 0;
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
char *
|
||||
_DEFUN (argz_next, (argz, argz_len, entry),
|
||||
char *argz _AND
|
||||
size_t argz_len _AND
|
||||
char *argz,
|
||||
size_t argz_len,
|
||||
const char *entry)
|
||||
{
|
||||
if (entry)
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
|
||||
char **argz _AND
|
||||
size_t *argz_len _AND
|
||||
const char *str _AND
|
||||
const char *with _AND
|
||||
char **argz,
|
||||
size_t *argz_len,
|
||||
const char *str,
|
||||
const char *with,
|
||||
unsigned *replace_count)
|
||||
{
|
||||
const int str_len = strlen(str);
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
|
||||
void
|
||||
_DEFUN (argz_stringify, (argz, argz_len, sep),
|
||||
char *argz _AND
|
||||
size_t argz_len _AND
|
||||
char *argz,
|
||||
size_t argz_len,
|
||||
int sep)
|
||||
{
|
||||
size_t i;
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (envz_add, (envz, envz_len, name, value),
|
||||
char **envz _AND
|
||||
size_t *envz_len _AND
|
||||
const char *name _AND
|
||||
char **envz,
|
||||
size_t *envz_len,
|
||||
const char *name,
|
||||
const char *value)
|
||||
{
|
||||
char *concat = NULL;
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
char *
|
||||
_DEFUN (envz_entry, (envz, envz_len, name),
|
||||
const char *envz _AND
|
||||
size_t envz_len _AND
|
||||
const char *envz,
|
||||
size_t envz_len,
|
||||
const char *name)
|
||||
{
|
||||
char *buf_ptr = (char *)envz;
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
|
||||
char *
|
||||
_DEFUN (envz_get, (envz, envz_len, name),
|
||||
const char *envz _AND
|
||||
size_t envz_len _AND
|
||||
const char *envz,
|
||||
size_t envz_len,
|
||||
const char *name)
|
||||
{
|
||||
char *buf_ptr = (char *)envz;
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
|
||||
error_t
|
||||
_DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
|
||||
char **envz _AND
|
||||
size_t *envz_len _AND
|
||||
const char *envz2 _AND
|
||||
size_t envz2_len _AND
|
||||
char **envz,
|
||||
size_t *envz_len,
|
||||
const char *envz2,
|
||||
size_t envz2_len,
|
||||
int override)
|
||||
{
|
||||
char *entry = NULL;
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
|
||||
void
|
||||
_DEFUN (envz_remove, (envz, envz_len, name),
|
||||
char **envz _AND
|
||||
size_t *envz_len _AND
|
||||
char **envz,
|
||||
size_t *envz_len,
|
||||
const char *name)
|
||||
{
|
||||
char *entry = NULL;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
void
|
||||
_DEFUN (envz_strip, (envz, envz_len),
|
||||
char **envz _AND
|
||||
char **envz,
|
||||
size_t *envz_len)
|
||||
{
|
||||
char *entry = 0;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ No supporting OS subroutines are required.
|
|||
#include "local.h"
|
||||
|
||||
int
|
||||
_DEFUN(iswctype,(c, desc), wint_t c _AND wctype_t desc)
|
||||
_DEFUN(iswctype,(c, desc), wint_t c, wctype_t desc)
|
||||
{
|
||||
switch (desc)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
#define JP_EUCJP 3
|
||||
|
||||
static wint_t
|
||||
_DEFUN (__jp2uc, (c, type), wint_t c _AND int type)
|
||||
_DEFUN (__jp2uc, (c, type), wint_t c, int type)
|
||||
{
|
||||
int index, adj;
|
||||
unsigned char byte1, byte2;
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ No supporting OS subroutines are required.
|
|||
|
||||
wint_t
|
||||
_DEFUN (_towctrans_r, (r, c, w),
|
||||
struct _reent *r _AND
|
||||
wint_t c _AND
|
||||
struct _reent *r,
|
||||
wint_t c,
|
||||
wctrans_t w)
|
||||
{
|
||||
if (w == WCT_TOLOWER)
|
||||
|
|
@ -95,7 +95,7 @@ _DEFUN (_towctrans_r, (r, c, w),
|
|||
#ifndef _REENT_ONLY
|
||||
wint_t
|
||||
_DEFUN (towctrans, (c, w),
|
||||
wint_t c _AND
|
||||
wint_t c,
|
||||
wctrans_t w)
|
||||
{
|
||||
return _towctrans_r (_REENT, c, w);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ No supporting OS subroutines are required.
|
|||
|
||||
wctrans_t
|
||||
_DEFUN (_wctrans_r, (r, c),
|
||||
struct _reent *r _AND
|
||||
struct _reent *r,
|
||||
const char *c)
|
||||
{
|
||||
if (!strcmp (c, "tolower"))
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ No supporting OS subroutines are required.
|
|||
|
||||
wctype_t
|
||||
_DEFUN (_wctype_r, (r, c),
|
||||
struct _reent *r _AND
|
||||
struct _reent *r,
|
||||
const char *c)
|
||||
{
|
||||
switch (*c)
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
|
|||
#if defined (ICONV_FROM_UCS_CES_EUC)
|
||||
static _VOID_PTR
|
||||
_DEFUN(euc_from_ucs_init, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -166,7 +166,7 @@ error1:
|
|||
|
||||
static size_t
|
||||
_DEFUN(euc_from_ucs_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -186,9 +186,9 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
|
|||
|
||||
static size_t
|
||||
_DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
register ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
register ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -262,7 +262,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_EUC)
|
||||
static _VOID_PTR
|
||||
_DEFUN(euc_to_ucs_init, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -326,7 +326,7 @@ error1:
|
|||
|
||||
static size_t
|
||||
_DEFUN(euc_to_ucs_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -346,8 +346,8 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
|
|||
|
||||
static ucs4_t
|
||||
_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@
|
|||
#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
|
||||
static size_t
|
||||
_DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
if (*outbytesleft < 1)
|
||||
|
|
@ -66,7 +66,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
|
||||
static _VOID_PTR
|
||||
_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
|
||||
|
|
@ -74,7 +74,7 @@ _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
|
|||
|
||||
static size_t
|
||||
_DEFUN(table_pcs_from_ucs_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
|
||||
|
|
@ -92,8 +92,8 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
|
|||
#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
|
||||
static ucs4_t
|
||||
_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
if (*inbytesleft < 1)
|
||||
|
|
@ -114,7 +114,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
|
|||
|
||||
static _VOID_PTR
|
||||
_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
|
||||
|
|
@ -122,7 +122,7 @@ _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
|
|||
|
||||
static size_t
|
||||
_DEFUN(table_pcs_to_ucs_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ _EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
|
|||
*/
|
||||
static size_t
|
||||
_DEFUN(table_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
_CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
|
||||
|
|
@ -90,7 +90,7 @@ _DEFUN(table_close, (rptr, data),
|
|||
#if defined (ICONV_FROM_UCS_CES_TABLE)
|
||||
static _VOID_PTR
|
||||
_DEFUN(table_init_from_ucs, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -128,9 +128,9 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
|
|||
|
||||
static size_t
|
||||
_DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
_CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
|
||||
|
|
@ -173,7 +173,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_TABLE)
|
||||
static _VOID_PTR
|
||||
_DEFUN(table_init_to_ucs, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -211,8 +211,8 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
|
|||
|
||||
static ucs4_t
|
||||
_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
_CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
|
||||
|
|
@ -304,7 +304,7 @@ _iconv_from_ucs_ces_handlers_table =
|
|||
*/
|
||||
static __inline ucs2_t
|
||||
_DEFUN(find_code_speed, (code, tblp),
|
||||
ucs2_t code _AND
|
||||
ucs2_t code,
|
||||
_CONST __uint16_t *tblp)
|
||||
{
|
||||
int idx = tblp[code >> 8];
|
||||
|
|
@ -327,7 +327,7 @@ _DEFUN(find_code_speed, (code, tblp),
|
|||
*/
|
||||
static __inline ucs2_t
|
||||
_DEFUN(find_code_speed_8bit, (code, tblp),
|
||||
ucs2_t code _AND
|
||||
ucs2_t code,
|
||||
_CONST unsigned char *tblp)
|
||||
{
|
||||
int idx;
|
||||
|
|
@ -367,7 +367,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
|
|||
*/
|
||||
static ucs2_t
|
||||
_DEFUN(find_code_size, (code, tblp),
|
||||
ucs2_t code _AND
|
||||
ucs2_t code,
|
||||
_CONST __uint16_t *tblp)
|
||||
{
|
||||
int first, last, cur, center;
|
||||
|
|
@ -461,8 +461,8 @@ _DEFUN(find_code_size, (code, tblp),
|
|||
*/
|
||||
static _CONST iconv_ccs_desc_t *
|
||||
_DEFUN(load_file, (rptr, name, direction),
|
||||
struct _reent *rptr _AND
|
||||
_CONST char *name _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *name,
|
||||
int direction)
|
||||
{
|
||||
int fd;
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
|
||||
static size_t
|
||||
_DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
register ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
register ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
if (in > 0x0000FFFF)
|
||||
|
|
@ -67,8 +67,8 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
|
||||
static ucs4_t
|
||||
_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
register ucs4_t res;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
|
||||
static _VOID_PTR
|
||||
_DEFUN(ucs_2_init, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int *data;
|
||||
|
|
@ -69,7 +69,7 @@ _DEFUN(ucs_2_init, (rptr, encoding),
|
|||
|
||||
static size_t
|
||||
_DEFUN(ucs_2_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
_free_r (rptr, data);
|
||||
|
|
@ -79,9 +79,9 @@ _DEFUN(ucs_2_close, (rptr, data),
|
|||
#if defined (ICONV_FROM_UCS_CES_UCS_2)
|
||||
static size_t
|
||||
_DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
if ((in >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
|
||||
|
|
@ -106,8 +106,8 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_UCS_2)
|
||||
static ucs4_t
|
||||
_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
ucs4_t res;
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
#if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
|
||||
static size_t
|
||||
_DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
register ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
register ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
if (in > 0x7FFFFFFF)
|
||||
|
|
@ -67,8 +67,8 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
|
||||
static ucs4_t
|
||||
_DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
register ucs4_t res;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
|
||||
static _VOID_PTR
|
||||
_DEFUN(ucs_4_init, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int *data;
|
||||
|
|
@ -70,7 +70,7 @@ _DEFUN(ucs_4_init, (rptr, encoding),
|
|||
|
||||
static size_t
|
||||
_DEFUN(ucs_4_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
_free_r(rptr, data);
|
||||
|
|
@ -81,9 +81,9 @@ _DEFUN(ucs_4_close, (rptr, data),
|
|||
#if defined (ICONV_FROM_UCS_CES_UCS_4)
|
||||
static size_t
|
||||
_DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
if ((in >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
|
||||
|
|
@ -108,8 +108,8 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_UCS_4)
|
||||
static ucs4_t
|
||||
_DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
ucs4_t res;
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@
|
|||
#if defined (ICONV_FROM_UCS_CES_US_ASCII)
|
||||
static size_t
|
||||
_DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
if (in > 0x7F)
|
||||
|
|
@ -61,8 +61,8 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_US_ASCII)
|
||||
static ucs4_t
|
||||
_DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
ucs4_t res;
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
static size_t
|
||||
_DEFUN(utf_16_close, (rptr, data),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_VOID_PTR data)
|
||||
{
|
||||
_free_r(rptr, data);
|
||||
|
|
@ -69,7 +69,7 @@ _DEFUN(utf_16_close, (rptr, data),
|
|||
#if defined (ICONV_FROM_UCS_CES_UTF_16)
|
||||
static _VOID_PTR
|
||||
_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int *data;
|
||||
|
|
@ -89,9 +89,9 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
|
|||
|
||||
static size_t
|
||||
_DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
register ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
register ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
register ucs2_t *cp;
|
||||
|
|
@ -171,7 +171,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_UTF_16)
|
||||
static _VOID_PTR
|
||||
_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding)
|
||||
{
|
||||
int *data;
|
||||
|
|
@ -191,8 +191,8 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
|
|||
|
||||
static ucs4_t
|
||||
_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
register ucs2_t w1;
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
#if defined (ICONV_FROM_UCS_CES_UTF_8)
|
||||
static size_t
|
||||
_DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
register ucs4_t in _AND
|
||||
unsigned char **outbuf _AND
|
||||
_VOID_PTR data,
|
||||
register ucs4_t in,
|
||||
unsigned char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
register unsigned char *cp;
|
||||
|
|
@ -126,8 +126,8 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
|
|||
#if defined (ICONV_TO_UCS_CES_UTF_8)
|
||||
static ucs4_t
|
||||
_DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
|
||||
_VOID_PTR data _AND
|
||||
_CONST unsigned char **inbuf _AND
|
||||
_VOID_PTR data,
|
||||
_CONST unsigned char **inbuf,
|
||||
size_t *inbytesleft)
|
||||
{
|
||||
register _CONST unsigned char *in = *inbuf;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
*/
|
||||
static _CONST char *
|
||||
_DEFUN(canonical_form, (rptr, str),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *str)
|
||||
{
|
||||
char *p, *p1;
|
||||
|
|
@ -94,9 +94,9 @@ _DEFUN(canonical_form, (rptr, str),
|
|||
*/
|
||||
static char *
|
||||
_DEFUN(find_alias, (rptr, alias, table, len),
|
||||
struct _reent *rptr _AND
|
||||
_CONST char *alias _AND
|
||||
_CONST char *table _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *alias,
|
||||
_CONST char *table,
|
||||
int len)
|
||||
{
|
||||
_CONST char *end;
|
||||
|
|
@ -148,7 +148,7 @@ search_again:
|
|||
*/
|
||||
char *
|
||||
_DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *ca)
|
||||
{
|
||||
char *p = (char *)ca;
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ No supporting OS subroutine calls are required.
|
|||
|
||||
iconv_t
|
||||
_DEFUN(iconv_open, (to, from),
|
||||
_CONST char *to _AND
|
||||
_CONST char *to,
|
||||
_CONST char *from)
|
||||
{
|
||||
return _iconv_open_r (_REENT, to, from);
|
||||
|
|
@ -130,10 +130,10 @@ _DEFUN(iconv_open, (to, from),
|
|||
|
||||
size_t
|
||||
_DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
|
||||
iconv_t cd _AND
|
||||
char **__restrict inbuf _AND
|
||||
size_t *__restrict inbytesleft _AND
|
||||
char **__restrict outbuf _AND
|
||||
iconv_t cd,
|
||||
char **__restrict inbuf,
|
||||
size_t *__restrict inbytesleft,
|
||||
char **__restrict outbuf,
|
||||
size_t *__restrict outbytesleft)
|
||||
{
|
||||
return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
|
||||
|
|
@ -151,8 +151,8 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
|
|||
#ifndef _REENT_ONLY
|
||||
iconv_t
|
||||
_DEFUN(_iconv_open_r, (rptr, to, from),
|
||||
struct _reent *rptr _AND
|
||||
_CONST char *to _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *to,
|
||||
_CONST char *from)
|
||||
{
|
||||
iconv_conversion_t *ic;
|
||||
|
|
@ -202,11 +202,11 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
|
|||
|
||||
size_t
|
||||
_DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
|
||||
struct _reent *rptr _AND
|
||||
iconv_t cd _AND
|
||||
_CONST char **inbuf _AND
|
||||
size_t *inbytesleft _AND
|
||||
char **outbuf _AND
|
||||
struct _reent *rptr,
|
||||
iconv_t cd,
|
||||
_CONST char **inbuf,
|
||||
size_t *inbytesleft,
|
||||
char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
|
||||
|
|
@ -289,7 +289,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
|
|||
|
||||
int
|
||||
_DEFUN(_iconv_close_r, (rptr, cd),
|
||||
struct _reent *rptr _AND
|
||||
struct _reent *rptr,
|
||||
iconv_t cd)
|
||||
{
|
||||
int res;
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@
|
|||
*/
|
||||
_CONST char *
|
||||
_DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
|
||||
struct _reent *rptr _AND
|
||||
_CONST char *file _AND
|
||||
_CONST char *dir _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *file,
|
||||
_CONST char *dir,
|
||||
_CONST char *ext)
|
||||
{
|
||||
int len1, len2, len3;
|
||||
|
|
@ -115,7 +115,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
|
|||
*/
|
||||
int
|
||||
_DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
|
||||
iconv_t cd _AND
|
||||
iconv_t cd,
|
||||
int direction)
|
||||
{
|
||||
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
|
||||
|
|
@ -138,7 +138,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
|
|||
*/
|
||||
int
|
||||
_DEFUN(_iconv_nls_is_stateful, (cd, direction),
|
||||
iconv_t cd _AND
|
||||
iconv_t cd,
|
||||
int direction)
|
||||
{
|
||||
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
|
||||
|
|
@ -167,11 +167,11 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction),
|
|||
*/
|
||||
size_t
|
||||
_DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
|
||||
struct _reent *rptr _AND
|
||||
iconv_t cd _AND
|
||||
_CONST char **inbuf _AND
|
||||
size_t *inbytesleft _AND
|
||||
char **outbuf _AND
|
||||
struct _reent *rptr,
|
||||
iconv_t cd,
|
||||
_CONST char **inbuf,
|
||||
size_t *inbytesleft,
|
||||
char **outbuf,
|
||||
size_t *outbytesleft)
|
||||
{
|
||||
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
|
||||
|
|
@ -221,8 +221,8 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
|
|||
*/
|
||||
_VOID
|
||||
_DEFUN(_iconv_nls_get_state, (cd, ps, direction),
|
||||
iconv_t cd _AND
|
||||
mbstate_t *ps _AND
|
||||
iconv_t cd,
|
||||
mbstate_t *ps,
|
||||
int direction)
|
||||
{
|
||||
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
|
||||
|
|
@ -248,8 +248,8 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
|
|||
*/
|
||||
int
|
||||
_DEFUN(_iconv_nls_set_state, (cd, ps, direction),
|
||||
iconv_t cd _AND
|
||||
mbstate_t *ps _AND
|
||||
iconv_t cd,
|
||||
mbstate_t *ps,
|
||||
int direction)
|
||||
{
|
||||
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
|
||||
|
|
@ -260,8 +260,8 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
|
|||
/* Same as iconv_open() but don't perform name resolving */
|
||||
static iconv_t
|
||||
_DEFUN(iconv_open1, (rptr, to, from),
|
||||
struct _reent *rptr _AND
|
||||
_CONST char *to _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *to,
|
||||
_CONST char *from)
|
||||
{
|
||||
iconv_conversion_t *ic;
|
||||
|
|
@ -317,10 +317,10 @@ _DEFUN(iconv_open1, (rptr, to, from),
|
|||
*/
|
||||
int
|
||||
_DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
|
||||
struct _reent *rptr _AND
|
||||
_CONST char *encoding _AND
|
||||
iconv_t *tomb _AND
|
||||
iconv_t *towc _AND
|
||||
struct _reent *rptr,
|
||||
_CONST char *encoding,
|
||||
iconv_t *tomb,
|
||||
iconv_t *towc,
|
||||
int flag)
|
||||
{
|
||||
_CONST char *wchar_encoding;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue