X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=defs.h;h=e32e3ed9fb35098ff95a1573d6bb8eba3881e865;hb=aa524c88c49814863cb7f19e5c8a8eeca6ce22fe;hp=f4e12a0e6a688783339a6e7edbb82c23dbc94373;hpb=c74c0b732b66139d59e616210718950f2853f3aa;p=strace diff --git a/defs.h b/defs.h index f4e12a0e..e32e3ed9 100644 --- a/defs.h +++ b/defs.h @@ -29,6 +29,10 @@ * $Id$ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef linux #include #endif @@ -40,10 +44,6 @@ # endif #endif -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - /* configuration section */ #ifndef MAX_QUALS #if defined(LINUX) && defined(MIPS) @@ -413,7 +413,7 @@ extern struct tcb *tcp_last; #endif extern int set_personality P((int personality)); -extern char *xlookup P((struct xlat *, int)); +extern char *xlookup P((const struct xlat *, int)); extern struct tcb *alloctcb P((int)); extern struct tcb *pid2tcb P((int)); extern void droptcb P((struct tcb *)); @@ -425,10 +425,10 @@ extern void qualify P((char *)); extern void newoutf P((struct tcb *)); extern int get_scno P((struct tcb *)); extern int trace_syscall P((struct tcb *)); -extern void printxval P((struct xlat *, int, char *)); +extern void printxval P((const struct xlat *, int, const char *)); extern int printargs P((struct tcb *)); -extern int addflags P((struct xlat *, int)); -extern int printflags P((struct xlat *, int)); +extern int addflags P((const struct xlat *, int)); +extern int printflags P((const struct xlat *, int, const char *)); extern int umoven P((struct tcb *, long, int, char *)); extern int umovestr P((struct tcb *, long, int, char *)); extern int upeek P((int, long, long *)); @@ -451,15 +451,14 @@ extern int clearbpt P((struct tcb *)); extern int setbpt P((struct tcb *)); extern int sigishandled P((struct tcb *, int)); extern void printcall P((struct tcb *)); -extern char *signame P((int)); +extern const char *signame P((int)); extern void printsignal P((int)); extern void printleader P((struct tcb *)); extern void printtrailer P((struct tcb *)); extern void tabto P((int)); extern void call_summary P((FILE *)); -extern void fake_execve P((struct tcb *, char *, char *[], char *[])); extern void printtv32 P((struct tcb*, long)); -extern void tprint_iov P((struct tcb *, int, long)); +extern void tprint_iov P((struct tcb *, unsigned long, unsigned long)); #ifdef LINUX extern int internal_clone P((struct tcb *)); @@ -469,13 +468,16 @@ extern int internal_exec P((struct tcb *)); extern int internal_wait P((struct tcb *, int)); extern int internal_exit P((struct tcb *)); -extern struct ioctlent *ioctl_lookup P((long)); -extern struct ioctlent *ioctl_next_match P((struct ioctlent *)); +extern const struct ioctlent *ioctl_lookup P((long)); +extern const struct ioctlent *ioctl_next_match P((const struct ioctlent *)); extern int ioctl_decode P((struct tcb *, long, long)); extern int term_ioctl P((struct tcb *, long, long)); extern int sock_ioctl P((struct tcb *, long, long)); extern int proc_ioctl P((struct tcb *, int, int)); extern int stream_ioctl P((struct tcb *, int, int)); +#ifdef LINUX +extern int rtc_ioctl P((struct tcb *, long, long)); +#endif extern void tv_tv P((struct timeval *, int, int)); extern int tv_nz P((struct timeval *)); @@ -523,49 +525,44 @@ struct sysent { int nargs; int sys_flags; int (*sys_func)(); - char *sys_name; + const char *sys_name; }; -extern struct sysent *sysent; +extern const struct sysent *sysent; extern int nsyscalls; -extern char **errnoent; +extern const char *const *errnoent; extern int nerrnos; struct ioctlent { - char *doth; - char *symbol; + const char *doth; + const char *symbol; unsigned long code; }; -extern struct ioctlent *ioctlent; -extern int nioctlent; - -extern char **signalent; -extern int nsignals; - -extern struct ioctlent *ioctlent; +extern const struct ioctlent *ioctlent; extern int nioctlents; -extern char **signalent; + +extern const char *const *signalent; extern int nsignals; -extern struct ioctlent ioctlent0[]; -extern int nioctlents0; -extern char *signalent0[]; -extern int nsignals0; +extern const struct ioctlent ioctlent0[]; +extern const int nioctlents0; +extern const char *const signalent0[]; +extern const int nsignals0; #if SUPPORTED_PERSONALITIES >= 2 -extern struct ioctlent ioctlent1[]; -extern int nioctlents1; -extern char *signalent1[]; -extern int nsignals1; +extern const struct ioctlent ioctlent1[]; +extern const int nioctlents1; +extern const char *const signalent1[]; +extern const int nsignals1; #endif /* SUPPORTED_PERSONALITIES >= 2 */ #if SUPPORTED_PERSONALITIES >= 3 -extern struct ioctlent ioctlent2[]; -extern int nioctlents2; -extern char *signalent2[]; -extern int nsignals2; +extern const struct ioctlent ioctlent2[]; +extern const int nioctlents2; +extern const char *const signalent2[]; +extern const int nsignals2; #endif /* SUPPORTED_PERSONALITIES >= 3 */ #if defined(FREEBSD) || (defined(LINUX) \