From 2b4cfd6a0e8d90c6cf7efa2be5b021903e50af0b Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 7 Jan 2014 05:13:26 +0100 Subject: [PATCH] update recently fixed prototypes, add functions that are weak_alias in musl --- func.h | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/func.h b/func.h index 87f2d7c..33fcb6c 100644 --- a/func.h +++ b/func.h @@ -28,7 +28,7 @@ F(const int32_t **, __ctype_tolower_loc, (void), ()) F(const int32_t **, __ctype_toupper_loc, (void), ()) F(int, __cxa_atexit, (void (*func)(void *), void *arg, void *dso), (func,arg,dso)) V(void, __cxa_finalize, (void *dso), (dso)) -F(int, __dladdr, (void *addr, Dl_info *info), (addr,info)) +F(int, __dladdr, (const void *addr, Dl_info *info), (addr,info)) F(int, __dlinfo, (void *dso, int req, void *res), (dso,req,res)) F(void *, __dlsym, (void *restrict p, const char *restrict s, void *restrict ra), (p,s,ra)) F(int, __dn_comp, (const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr), (src,dst,space,dnptrs,lastdnptr)) @@ -326,6 +326,7 @@ F(speed_t, cfgetospeed, (const struct termios *tio), (tio)) V(void, cfmakeraw, (struct termios *t), (t)) F(int, cfsetispeed, (struct termios *tio, speed_t speed), (tio,speed)) F(int, cfsetospeed, (struct termios *tio, speed_t speed), (tio,speed)) +F(int, cfsetspeed, (struct termios *tio, speed_t speed), (tio,speed)) F(int, chdir, (const char *path), (path)) F(int, chmod, (const char *path, mode_t mode), (path,mode)) F(int, chown, (const char *path, uid_t uid, gid_t gid), (path,uid,gid)) @@ -339,11 +340,13 @@ F(clock_t, clock, (), ()) F(int, clock_adjtime, (clockid_t clock_id, struct timex *utx), (clock_id,utx)) F(int, clock_getcpuclockid, (pid_t pid, clockid_t *clk), (pid,clk)) F(int, clock_getres, (clockid_t clk, struct timespec *ts), (clk,ts)) +F(int, clock_gettime, (clockid_t clk, struct timespec *ts), (clk,ts)) F(int, clock_nanosleep, (clockid_t clk, int flags, const struct timespec *req, struct timespec *rem), (clk,flags,req,rem)) F(int, clock_settime, (clockid_t clk, const struct timespec *ts), (clk,ts)) F(double complex, clog, (double complex z), (z)) F(float complex, clogf, (float complex z), (z)) F(long double complex, clogl, (long double complex z), (z)) +XF(int, clone, (int (*func)(void *), void *stack, int flags, void *arg, ...)) F(int, close, (int fd), (fd)) F(int, closedir, (DIR *dir), (dir)) V(void, closelog, (void), ()) @@ -372,6 +375,7 @@ F(float, crealf, (float complex z), (z)) F(long double, creall, (long double complex z), (z)) F(int, creat, (const char *filename, mode_t mode), (filename,mode)) F(char *, crypt, (const char *key, const char *salt), (key,salt)) +F(char *, crypt_r, (const char *key, const char *salt, struct crypt_data *data), (key,salt,data)) F(double complex, csin, (double complex z), (z)) F(float complex, csinf, (float complex z), (z)) F(double complex, csinh, (double complex z), (z)) @@ -401,23 +405,31 @@ F(int, dirfd, (DIR *d), (d)) F(char *, dirname, (char *s), (s)) F(div_t, div, (int num, int den), (num,den)) F(int, dl_iterate_phdr, (int(*callback)(struct dl_phdr_info *info, size_t size, void *data), void *data), (callback,data)) -F(int, dladdr, (void *addr, Dl_info *info), (addr,info)) +F(int, dladdr, (const void *addr, Dl_info *info), (addr,info)) F(int, dlclose, (void *p), (p)) F(char *, dlerror, (), ()) F(int, dlinfo, (void *dso, int req, void *res), (dso,req,res)) F(void *, dlopen, (const char *file, int mode), (file,mode)) //F(void *, dlsym, (void *restrict p, const char *restrict s), (p,s)) +F(int, dn_comp, (const char *src, unsigned char *dst, int space, unsigned char **dnptrs, unsigned char **lastdnptr), (src,dst,space,dnptrs,lastdnptr)) +F(int, dn_expand, (const unsigned char *base, const unsigned char *end, const unsigned char *src, char *dest, int space), (base,end,src,dest,space)) F(int, dn_skipname, (const unsigned char *s, const unsigned char *end), (s,end)) F(char *, dngettext, (const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n), (domainname,msgid1,msgid2,n)) XF(int, dprintf, (int fd, const char *restrict fmt, ...)) F(double, drand48, (void), ()) +F(double, drem, (double x, double y), (x,y)) +F(float, dremf, (float x, float y), (x,y)) F(int, dup, (int fd), (fd)) F(int, dup2, (int old, int new), (old,new)) +F(int, dup3, (int old, int new, int flags), (old,new,flags)) F(locale_t, duplocale, (locale_t old), (old)) +F(int, eaccess, (const char *filename, int amode), (filename,amode)) F(char *, ecvt, (double x, int n, int *dp, int *sign), (x,n,dp,sign)) +V(void, endgrent, (), ()) V(void, endhostent, (void), ()) F(int, endmntent, (FILE *f), (f)) V(void, endprotoent, (void), ()) +V(void, endpwent, (), ()) V(void, endservent, (void), ()) V(void, endspent, (), ()) V(void, endusershell, (void), ()) @@ -560,6 +572,7 @@ F(int, fsetpos, (FILE *f, const fpos_t *pos), (f,pos)) F(int, fsetxattr, (int filedes, const char *name, const void *value, size_t size, int flags), (filedes,name,value,size,flags)) F(int, fstat, (int fd, struct stat *st), (fd,st)) F(int, fstatat, (int fd, const char *restrict path, struct stat *restrict buf, int flag), (fd,path,buf,flag)) +F(int, fstatfs, (int fd, struct statfs *buf), (fd,buf)) F(int, fstatvfs, (int fd, struct statvfs *buf), (fd,buf)) F(int, fsync, (int fd), (fd)) F(long, ftell, (FILE *f), (f)) @@ -587,6 +600,7 @@ F(int, getchar_unlocked, (void), ()) F(char *, getcwd, (char *buf, size_t size), (buf,size)) F(struct tm *, getdate, (const char *s), (s)) F(ssize_t, getdelim, (char **restrict s, size_t *restrict n, int delim, FILE *restrict f), (s,n,delim,f)) +F(int, getdents, (int fd, struct dirent *buf, size_t len), (fd,buf,len)) F(int, getdomainname, (char *name, size_t len), (name,len)) F(int, getdtablesize, (void), ()) F(gid_t, getegid, (void), ()) @@ -670,6 +684,7 @@ F(ssize_t, getxattr, (const char *path, const char *name, void *value, size_t si F(int, glob, (const char *restrict pat, int flags, int (*errfunc)(const char *path, int err), glob_t *restrict g), (pat,flags,errfunc,g)) V(void, globfree, (glob_t *g), (g)) F(struct tm *, gmtime, (const time_t *t), (t)) +F(struct tm *, gmtime_r, (const time_t *restrict t, struct tm *restrict tm), (t,tm)) F(int, grantpt, (int fd), (fd)) F(char *, hasmntopt, (const struct mntent *mnt, const char *opt), (mnt,opt)) F(int, hcreate, (size_t nel), (nel)) @@ -698,7 +713,7 @@ F(char *, index, (const char *s, int c), (s,c)) F(in_addr_t, inet_addr, (const char *p), (p)) F(int, inet_aton, (const char *cp, struct in_addr *inp), (cp,inp)) F(in_addr_t, inet_lnaof, (struct in_addr in), (in)) -F(struct in_addr, inet_makeaddr, (int net, int host), (net,host)) +F(struct in_addr, inet_makeaddr, (in_addr_t net, in_addr_t host), (net,host)) F(in_addr_t, inet_netof, (struct in_addr in), (in)) F(in_addr_t, inet_network, (const char *p), (p)) F(char *, inet_ntoa, (struct in_addr in), (in)) @@ -790,6 +805,9 @@ F(long double, ldexpl, (long double x, int n), (x,n)) F(ldiv_t, ldiv, (long num, long den), (num,den)) F(void *, lfind, (const void *key, const void *base, size_t *nelp, size_t width, int (*compar)(const void *, const void *)), (key,base,nelp,width,compar)) F(double, lgamma, (double x), (x)) +F(double, lgamma_r, (double x, int *signgamp), (x,signgamp)) +F(float, lgammaf_r, (float x, int *signgamp), (x,signgamp)) +F(long double, lgammal_r, (long double x, int *sg), (x,sg)) F(float, lgammaf, (float x), (x)) F(long double, lgammal, (long double x), (x)) F(ssize_t, lgetxattr, (const char *path, const char *name, void *value, size_t size), (path,name,value,size)) @@ -809,6 +827,7 @@ F(long long, llroundf, (float x), (x)) F(long long, llroundl, (long double x), (x)) F(struct lconv *, localeconv, (void), ()) F(struct tm *, localtime, (const time_t *t), (t)) +F(struct tm *, localtime_r, (const time_t *restrict t, struct tm *restrict tm), (t,tm)) F(int, lockf, (int fd, int op, off_t size), (fd,op,size)) F(double, log, (double x), (x)) F(double, log10, (double x), (x)) @@ -838,6 +857,7 @@ F(off_t, lseek, (int fd, off_t offset, int whence), (fd,offset,whence)) F(int, lsetxattr, (const char *path, const char *name, const void *value, size_t size, int flags), (path,name,value,size,flags)) F(int, lstat, (const char *restrict path, struct stat *restrict buf), (path,buf)) F(int, lutimes, (const char *filename, const struct timeval tv[2]), (filename,tv)) +F(int, madvise, (void *addr, size_t len, int advice), (addr,len,advice)) F(void *, malloc, (size_t n), (n)) F(int, mblen, (const char *s, size_t n), (s,n)) F(size_t, mbrlen, (const char *restrict s, size_t n, mbstate_t *restrict st), (s,n,st)) @@ -847,6 +867,7 @@ F(size_t, mbsnrtowcs, (wchar_t *restrict wcs, const char **restrict src, size_t F(size_t, mbsrtowcs, (wchar_t *restrict ws, const char **restrict src, size_t wn, mbstate_t *restrict st), (ws,src,wn,st)) F(size_t, mbstowcs, (wchar_t *restrict ws, const char *restrict s, size_t wn), (ws,s,wn)) F(int, mbtowc, (wchar_t *restrict wc, const char *restrict src, size_t n), (wc,src,n)) +F(void *, memalign, (size_t align, size_t len), (align,len)) F(void *, memccpy, (void *restrict dest, const void *restrict src, int c, size_t n), (dest,src,c,n)) F(void *, memchr, (const void *src, int c, size_t n), (src,c,n)) F(int, memcmp, (const void *vl, const void *vr, size_t n), (vl,vr,n)) @@ -854,6 +875,7 @@ F(void *, memcpy, (void *restrict dest, const void *restrict src, size_t n), (de F(void *, memmem, (const void *h0, size_t k, const void *n0, size_t l), (h0,k,n0,l)) F(void *, memmove, (void *dest, const void *src, size_t n), (dest,src,n)) F(void *, mempcpy, (void *dest, const void *src, size_t n), (dest,src,n)) +F(void *, memrchr, (const void *m, int c, size_t n), (m,c,n)) F(void *, memset, (void *dest, int c, size_t n), (dest,c,n)) F(int, mincore, (void *addr, size_t len, unsigned char *vec), (addr,len,vec)) F(int, mkdir, (const char *path, mode_t mode), (path,mode)) @@ -864,12 +886,14 @@ F(int, mkfifoat, (int fd, const char *path, mode_t mode), (fd,path,mode)) F(int, mknod, (const char *path, mode_t mode, dev_t dev), (path,mode,dev)) F(int, mknodat, (int fd, const char *path, mode_t mode, dev_t dev), (fd,path,mode,dev)) F(int, mkostemp, (char *template, int flags), (template,flags)) +F(int, mkostemps, (char *template, int len, int flags), (template,len,flags)) F(int, mkstemp, (char *template), (template)) F(int, mkstemps, (char *template, int len), (template,len)) F(char *, mktemp, (char *template), (template)) F(time_t, mktime, (struct tm *tm), (tm)) F(int, mlock, (const void *addr, size_t len), (addr,len)) F(int, mlockall, (int flags), (flags)) +F(void *, mmap, (void *start, size_t len, int prot, int flags, int fd, off_t off), (start,len,prot,flags,fd,off)) F(double, modf, (double x, double *iptr), (x,iptr)) F(float, modff, (float x, float *iptr), (x,iptr)) F(long double, modfl, (long double x, long double *iptr), (x,iptr)) @@ -886,6 +910,7 @@ F(ssize_t, mq_timedreceive, (mqd_t mqd, char *restrict msg, size_t len, unsigned F(int, mq_timedsend, (mqd_t mqd, const char *msg, size_t len, unsigned prio, const struct timespec *at), (mqd,msg,len,prio,at)) F(int, mq_unlink, (const char *name), (name)) F(long, mrand48, (void), ()) +XF(void *, mremap, (void *old_addr, size_t old_len, size_t new_len, int flags, ...)) F(int, msgctl, (int q, int cmd, struct msqid_ds *buf), (q,cmd,buf)) F(int, msgget, (key_t k, int flag), (k,flag)) F(ssize_t, msgrcv, (int q, void *m, size_t len, long type, int flag), (q,m,len,type,flag)) @@ -893,6 +918,7 @@ F(int, msgsnd, (int q, const void *m, size_t len, int flag), (q,m,len,flag)) F(int, msync, (void *start, size_t len, int flags), (start,len,flags)) F(int, munlock, (const void *addr, size_t len), (addr,len)) F(int, munlockall, (void), ()) +F(int, munmap, (void *start, size_t len), (start,len)) F(double, nan, (const char *s), (s)) F(float, nanf, (const char *s), (s)) F(long double, nanl, (const char *s), (s)) @@ -910,6 +936,8 @@ F(long double, nexttowardl, (long double x, long double y), (x,y)) F(int, nftw, (const char *path, int (*fn)(const char *, const struct stat *, int, struct FTW *), int fd_limit, int flags), (path,fn,fd_limit,flags)) F(char *, ngettext, (const char *msgid1, const char *msgid2, unsigned long int n), (msgid1,msgid2,n)) F(int, nice, (int inc), (inc)) +F(char *, nl_langinfo, (nl_item item), (item)) +F(char *, nl_langinfo_l, (nl_item item, locale_t loc), (item,loc)) F(long, nrand48, (unsigned short s[3]), (s)) F(uint32_t, ntohl, (uint32_t n), (n)) F(uint16_t, ntohs, (uint16_t n), (n)) @@ -958,6 +986,9 @@ F(int, posix_spawnattr_setsigdefault, (posix_spawnattr_t *restrict attr, const s F(int, posix_spawnattr_setsigmask, (posix_spawnattr_t *restrict attr, const sigset_t *restrict mask), (attr,mask)) F(int, posix_spawnp, (pid_t *restrict res, const char *restrict file, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *restrict attr, char *const argv[restrict], char *const envp[restrict]), (res,file,fa,attr,argv,envp)) F(double, pow, (double x, double y), (x,y)) +F(double, pow10, (double x), (x)) +F(float, pow10f, (float x), (x)) +F(long double, pow10l, (long double x), (x)) F(float, powf, (float x, float y), (x,y)) F(long double, powl, (long double x, long double y), (x,y)) F(int, ppoll, (struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask), (fds,n,to,mask)) @@ -1057,6 +1088,7 @@ F(int, pthread_rwlockattr_destroy, (pthread_rwlockattr_t *a), (a)) F(int, pthread_rwlockattr_getpshared, (const pthread_rwlockattr_t *restrict a, int *restrict pshared), (a,pshared)) F(int, pthread_rwlockattr_init, (pthread_rwlockattr_t *a), (a)) F(int, pthread_rwlockattr_setpshared, (pthread_rwlockattr_t *a, int pshared), (a,pshared)) +F(pthread_t, pthread_self, (), ()) F(int, pthread_setaffinity_np, (pthread_t td, size_t size, const cpu_set_t *set), (td,size,set)) F(int, pthread_setcancelstate, (int new, int *old), (new,old)) F(int, pthread_setcanceltype, (int new, int *old), (new,old)) @@ -1156,6 +1188,7 @@ F(int, sched_rr_get_interval, (pid_t pid, struct timespec *ts), (pid,ts)) F(int, sched_setaffinity, (pid_t tid, size_t size, const cpu_set_t *set), (tid,size,set)) F(int, sched_setparam, (pid_t pid, const struct sched_param *param), (pid,param)) F(int, sched_setscheduler, (pid_t pid, int sched, const struct sched_param *param), (pid,sched,param)) +F(int, sched_yield, (), ()) F(unsigned short *, seed48, (unsigned short *s), (s)) V(void, seekdir, (DIR *dir, long off), (dir,off)) F(int, select, (int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, struct timeval *restrict tv), (n,rfds,wfds,efds,tv)) @@ -1224,6 +1257,7 @@ F(int, shmctl, (int id, int cmd, struct shmid_ds *buf), (id,cmd,buf)) F(int, shmdt, (const void *addr), (addr)) F(int, shmget, (key_t key, size_t size, int flag), (key,size,flag)) F(int, shutdown, (int fd, int how), (fd,how)) +F(int, sigaction, (int sig, const struct sigaction *restrict sa, struct sigaction *restrict old), (sig,sa,old)) F(int, sigaddset, (sigset_t *set, int sig), (set,sig)) F(int, sigaltstack, (const stack_t *restrict ss, stack_t *restrict old), (ss,old)) F(int, sigandset, (sigset_t *dest, sigset_t *left, sigset_t *right), (dest,left,right)) @@ -1276,17 +1310,22 @@ V(void, srand48, (long seed), (seed)) V(void, srandom, (unsigned seed), (seed)) XF(int, sscanf, (const char *restrict s, const char *restrict fmt, ...)) F(int, stat, (const char *restrict path, struct stat *restrict buf), (path,buf)) +F(int, statfs, (const char *path, struct statfs *buf), (path,buf)) F(int, statvfs, (const char *restrict path, struct statvfs *restrict buf), (path,buf)) F(int, stime, (time_t *t), (t)) +F(char *, stpcpy, (char *restrict d, const char *restrict s), (d,s)) +F(char *, stpncpy, (char *restrict d, const char *restrict s, size_t n), (d,s,n)) F(int, strcasecmp, (const char *_l, const char *_r), (_l,_r)) F(int, strcasecmp_l, (const char *l, const char *r, locale_t loc), (l,r,loc)) F(char *, strcasestr, (const char *h, const char *n), (h,n)) F(char *, strcat, (char *restrict dest, const char *restrict src), (dest,src)) F(char *, strchr, (const char *s, int c), (s,c)) +F(char *, strchrnul, (const char *s, int c), (s,c)) F(int, strcmp, (const char *l, const char *r), (l,r)) F(int, strcoll, (const char *l, const char *r), (l,r)) F(char *, strcpy, (char *restrict dest, const char *restrict src), (dest,src)) F(size_t, strcspn, (const char *s, const char *c), (s,c)) +F(char *, strdup, (const char *s), (s)) F(char *, strerror, (int e), (e)) F(char *, strerror_l, (int err, locale_t l), (err,l)) F(int, strerror_r, (int err, char *buf, size_t buflen), (err,buf,buflen)) @@ -1398,6 +1437,7 @@ F(void *, tsearch, (const void *key, void **rootp, int (*compar)(const void *, c F(char *, ttyname, (int fd), (fd)) F(int, ttyname_r, (int fd, char *name, size_t size), (fd,name,size)) V(void, twalk, (const void *root, void (*action)(const void *, VISIT, int)), (root,action)) +V(void, tzset, (), ()) F(unsigned, ualarm, (unsigned value, unsigned interval), (value,interval)) F(int, ulckpwdf, (), ()) XF(long, ulimit, (int cmd, ...)) @@ -1424,6 +1464,7 @@ F(int, vdprintf, (int fd, const char *restrict fmt, va_list ap), (fd,fmt,ap)) V(_Noreturn void, verr, (int status, const char *fmt, va_list ap), (status,fmt,ap)) V(_Noreturn void, verrx, (int status, const char *fmt, va_list ap), (status,fmt,ap)) F(int, versionsort, (const struct dirent **a, const struct dirent **b), (a,b)) +F(pid_t, vfork, (void), ()) F(int, vfprintf, (FILE *restrict f, const char *restrict fmt, va_list ap), (f,fmt,ap)) F(int, vfscanf, (FILE *restrict f, const char *restrict fmt, va_list ap), (f,fmt,ap)) F(int, vfwprintf, (FILE *restrict f, const wchar_t *restrict fmt, va_list ap), (f,fmt,ap)) -- 2.20.1