From e83e157021177930b64ec4aa4983bbe13b39e91b Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sat, 25 Feb 2012 15:41:21 +0000 Subject: Compress blank lines Suppress repeated empty lines left after automated code removal. This change was made by filtering every source code file through "cat -s". --- bjm.c | 1 - configure.ac | 1 - defs.h | 2 -- desc.c | 2 -- file.c | 24 ------------------------ io.c | 3 --- ioctlsort.c | 1 - ipc.c | 2 -- linux/ioctlent.sh | 2 -- linux/ioctlsort.c | 2 -- linux/microblaze/syscallent.h | 3 --- linux/x86_64/gentab.pl | 2 -- mem.c | 10 ---------- net.c | 4 ---- pathtrace.c | 1 - process.c | 28 ---------------------------- quota.c | 1 - resource.c | 5 ----- signal.c | 21 --------------------- sock.c | 1 - strace.c | 12 ------------ stream.c | 3 --- syscall.c | 3 --- system.c | 7 ------- term.c | 1 - time.c | 3 --- util.c | 6 ------ 27 files changed, 151 deletions(-) diff --git a/bjm.c b/bjm.c index 66c64fd..b5eb52a 100644 --- a/bjm.c +++ b/bjm.c @@ -31,7 +31,6 @@ */ #include "defs.h" - #include #include #include diff --git a/configure.ac b/configure.ac index d1513ca..ee9b8e8 100644 --- a/configure.ac +++ b/configure.ac @@ -223,7 +223,6 @@ AC_CHECK_MEMBERS([struct sigcontext.sc_hi2],,, [#include # include #endif]) - AC_CHECK_DECLS([sys_errlist]) AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include ]) AC_CHECK_DECLS([ diff --git a/defs.h b/defs.h index 67cd5c3..f8e5b1a 100644 --- a/defs.h +++ b/defs.h @@ -218,7 +218,6 @@ extern long ptrace(int, int, char *, long); # define PERSONALITY1_WORDSIZE 4 #endif - #if !HAVE_DECL_PTRACE_SETOPTIONS # define PTRACE_SETOPTIONS 0x4200 #endif @@ -284,7 +283,6 @@ extern long ptrace(int, int, char *, long); # define PTRACE_EVENT_STOP1 128 #endif - #if !defined __GNUC__ # define __attribute__(x) /*nothing*/ #endif diff --git a/desc.c b/desc.c index be327eb..9776ed6 100644 --- a/desc.c +++ b/desc.c @@ -50,7 +50,6 @@ #define printflock printflock64 /* Horrider hack */ #endif - static const struct xlat fcntlcmds[] = { { F_DUPFD, "F_DUPFD" }, { F_GETFD, "F_GETFD" }, @@ -592,7 +591,6 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness) return 0; } - int sys_oldselect(struct tcb *tcp) { diff --git a/file.c b/file.c index b4cb626..cec7afd 100644 --- a/file.c +++ b/file.c @@ -140,7 +140,6 @@ struct stat_sparc64 { #include - #ifdef HAVE_SYS_VFS_H # include #endif @@ -152,7 +151,6 @@ struct stat_sparc64 { # define XATTR_REPLACE 2 #endif - #if _LFS64_LARGEFILE # ifdef HAVE_INTTYPES_H # include @@ -190,7 +188,6 @@ struct stat_sparc64 { # include #endif - const struct xlat open_access_modes[] = { { O_RDONLY, "O_RDONLY" }, { O_WRONLY, "O_WRONLY" }, @@ -302,7 +299,6 @@ const struct xlat open_mode_flags[] = { { 0, NULL }, }; - #ifndef AT_FDCWD # define AT_FDCWD -100 #endif @@ -900,7 +896,6 @@ static const struct xlat fileflags[] = { { 0, NULL }, }; - #ifndef HAVE_LONG_LONG_OFF_T static void realprintstat(struct tcb *tcp, struct stat *statbuf) @@ -967,7 +962,6 @@ realprintstat(struct tcb *tcp, struct stat *statbuf) tprints("...}"); } - static void printstat(struct tcb *tcp, long addr) { @@ -1182,7 +1176,6 @@ convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf) newbuf->st_blocks = 0; /* not supported in old_stat */ } - static void printoldstat(struct tcb *tcp, long addr) { @@ -1380,7 +1373,6 @@ sys_oldlstat(struct tcb *tcp) } #endif - #if defined(LINUXSPARC) int @@ -1503,7 +1495,6 @@ sys_acl(struct tcb *tcp) return 0; } - int sys_facl(struct tcb *tcp) { @@ -1523,7 +1514,6 @@ sys_facl(struct tcb *tcp) return 0; } - static const struct xlat aclipc[] = { # ifdef IPC_SHM { IPC_SHM, "IPC_SHM" }, @@ -1537,7 +1527,6 @@ static const struct xlat aclipc[] = { { 0, NULL }, }; - int sys_aclipc(struct tcb *tcp) { @@ -1562,7 +1551,6 @@ sys_aclipc(struct tcb *tcp) #endif /* LINUXSPARC */ - static const struct xlat fsmagic[] = { { 0x73757245, "CODA_SUPER_MAGIC" }, { 0x012ff7b7, "COH_SUPER_MAGIC" }, @@ -1596,8 +1584,6 @@ static const struct xlat fsmagic[] = { { 0, NULL }, }; - - static const char * sprintfstype(int magic) { @@ -2172,7 +2158,6 @@ sys_mknodat(struct tcb *tcp) return decode_mknod(tcp, 1); } - int sys_fsync(struct tcb *tcp) { @@ -2182,7 +2167,6 @@ sys_fsync(struct tcb *tcp) return 0; } - static void printdir(struct tcb *tcp, long addr) { @@ -2220,7 +2204,6 @@ sys_readdir(struct tcb *tcp) return 0; } - static const struct xlat direnttypes[] = { { DT_UNKNOWN, "DT_UNKNOWN" }, { DT_FIFO, "DT_FIFO" }, @@ -2234,7 +2217,6 @@ static const struct xlat direnttypes[] = { { 0, NULL }, }; - int sys_getdents(struct tcb *tcp) { @@ -2290,7 +2272,6 @@ sys_getdents(struct tcb *tcp) return 0; } - #if _LFS64_LARGEFILE int sys_getdents64(struct tcb *tcp) @@ -2355,7 +2336,6 @@ sys_getdents64(struct tcb *tcp) } #endif - int sys_getcwd(struct tcb *tcp) { @@ -2369,7 +2349,6 @@ sys_getcwd(struct tcb *tcp) return 0; } - #ifdef HAVE_SYS_ASYNCH_H int @@ -2598,7 +2577,6 @@ sys_fremovexattr(struct tcb *tcp) return 0; } - static const struct xlat advise[] = { { POSIX_FADV_NORMAL, "POSIX_FADV_NORMAL" }, { POSIX_FADV_RANDOM, "POSIX_FADV_RANDOM" }, @@ -2609,7 +2587,6 @@ static const struct xlat advise[] = { { 0, NULL } }; - int sys_fadvise64(struct tcb *tcp) { @@ -2624,7 +2601,6 @@ sys_fadvise64(struct tcb *tcp) return 0; } - int sys_fadvise64_64(struct tcb *tcp) { diff --git a/io.c b/io.c index 7dff4e6..8f2b45a 100644 --- a/io.c +++ b/io.c @@ -168,9 +168,6 @@ sys_writev(struct tcb *tcp) } #endif - - - /* The SH4 ABI does allow long longs in odd-numbered registers, but does not allow them to be split between registers and memory - and there are only four argument registers for normal functions. As a diff --git a/ioctlsort.c b/ioctlsort.c index 7881a91..50f4760 100644 --- a/ioctlsort.c +++ b/ioctlsort.c @@ -28,7 +28,6 @@ * $Id$ */ - #include #ifdef STDC_HEADERS diff --git a/ipc.c b/ipc.c index d8757c1..e1746cb 100644 --- a/ipc.c +++ b/ipc.c @@ -32,7 +32,6 @@ #include "defs.h" - # ifdef HAVE_MQUEUE_H # include # endif @@ -443,7 +442,6 @@ int sys_shmdt(struct tcb *tcp) return 0; } - int sys_mq_open(struct tcb *tcp) { diff --git a/linux/ioctlent.sh b/linux/ioctlent.sh index 65b005d..985deff 100755 --- a/linux/ioctlent.sh +++ b/linux/ioctlent.sh @@ -57,7 +57,6 @@ s/^\(.*\):[[:space:]]*#[[:space:]]*define[[:space:]]*\([A-Z0-9_]*\)[[:space:]]*\ >> ioctls.h } - > ioctls.h lookup_ioctls 03 linux/hdreg.h @@ -102,7 +101,6 @@ regexp='^[[:space:]]*#[[:space:]]*define[[:space:]]\+[A-Z][A-Z0-9_]*[[:space:]]\ # Sort and drop dups? # sort -u ioctls1.h && mv ioctls1.h ioctls.h - > ioctldefs.h # Collect potential ioctl names. ('bases' is a bad name. Sigh) diff --git a/linux/ioctlsort.c b/linux/ioctlsort.c index 9b18d29..dab30f1 100644 --- a/linux/ioctlsort.c +++ b/linux/ioctlsort.c @@ -22,7 +22,6 @@ struct ioctlent ioctls[] = { int nioctls = sizeof(ioctls) / sizeof(ioctls[0]); - int compare(const void* a, const void* b) { unsigned long code1 = ((struct ioctlent *) a)->code; unsigned long code2 = ((struct ioctlent *) b)->code; @@ -31,7 +30,6 @@ int compare(const void* a, const void* b) { return (code1 > code2) ? 1 : (code1 < code2) ? -1 : strcmp(name1, name2); } - int main(int argc, char** argv) { int i; diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h index 36ca381..04ccdde 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -332,9 +332,6 @@ { 5, TD|TF, sys_linkat, "linkat" }, /* 303 */ { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 304 */ { 4, TD|TF, sys_readlinkat, "readlinkat" }, /* 305 */ - - - { 3, TD|TF, sys_fchmodat, "fchmodat" }, /* 306 */ { 3, TD|TF, sys_faccessat, "faccessat" }, /* 307 */ { 6, TD, sys_pselect6, "pselect6" }, /* 308 */ diff --git a/linux/x86_64/gentab.pl b/linux/x86_64/gentab.pl index 2858e07..52f7aa9 100644 --- a/linux/x86_64/gentab.pl +++ b/linux/x86_64/gentab.pl @@ -45,8 +45,6 @@ while () { open(SL, ">syscallnum.h") || die "cannot create syscallnum.h\n"; - - open(S,$ARGV[1]) || die "cannot open syscall file $ARGV[1]\n"; while () { $name = ""; diff --git a/mem.c b/mem.c index 1fc8595..6432a35 100644 --- a/mem.c +++ b/mem.c @@ -63,7 +63,6 @@ sys_brk(struct tcb *tcp) return RVAL_HEX; } - static const struct xlat mmap_prot[] = { { PROT_NONE, "PROT_NONE", }, { PROT_READ, "PROT_READ" }, @@ -368,7 +367,6 @@ sys_mmap64(struct tcb *tcp) } #endif /* _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T */ - int sys_munmap(struct tcb *tcp) { @@ -390,7 +388,6 @@ sys_mprotect(struct tcb *tcp) return 0; } - static const struct xlat mremap_flags[] = { { MREMAP_MAYMOVE, "MREMAP_MAYMOVE" }, #ifdef MREMAP_FIXED @@ -434,7 +431,6 @@ static const struct xlat madvise_cmds[] = { { 0, NULL }, }; - int sys_madvise(struct tcb *tcp) { @@ -445,7 +441,6 @@ sys_madvise(struct tcb *tcp) return 0; } - static const struct xlat mlockall_flags[] = { #ifdef MCL_CURRENT { MCL_CURRENT, "MCL_CURRENT" }, @@ -465,8 +460,6 @@ sys_mlockall(struct tcb *tcp) return 0; } - - #ifdef MS_ASYNC static const struct xlat mctl_sync[] = { @@ -712,7 +705,6 @@ sys_remap_file_pages(struct tcb *tcp) return 0; } - #define MPOL_DEFAULT 0 #define MPOL_PREFERRED 1 #define MPOL_BIND 2 @@ -725,7 +717,6 @@ sys_remap_file_pages(struct tcb *tcp) #define MPOL_MF_MOVE (1<<1) #define MPOL_MF_MOVE_ALL (1<<2) - static const struct xlat policies[] = { { MPOL_DEFAULT, "MPOL_DEFAULT" }, { MPOL_PREFERRED, "MPOL_PREFERRED" }, @@ -753,7 +744,6 @@ static const struct xlat move_pages_flags[] = { { 0, NULL } }; - static void get_nodes(struct tcb *tcp, unsigned long ptr, unsigned long maxnodes, int err) { diff --git a/net.c b/net.c index d5baf23..888077a 100644 --- a/net.c +++ b/net.c @@ -103,7 +103,6 @@ #define PF_UNSPEC AF_UNSPEC #endif - /* Under Linux these are enums so we can't test for them with ifdef. */ #define IPPROTO_EGP IPPROTO_EGP #define IPPROTO_PUP IPPROTO_PUP @@ -1206,7 +1205,6 @@ static const struct xlat af_packet_types[] = { }; #endif /* defined(AF_PACKET) */ - void printsock(struct tcb *tcp, long addr, int addrlen) { @@ -1517,7 +1515,6 @@ sys_socket(struct tcb *tcp) return 0; } - int sys_bind(struct tcb *tcp) { @@ -2138,7 +2135,6 @@ printsockopt(struct tcb *tcp, int level, int name, long addr, int len) return 0; } - #ifdef HAVE_STRUCT_OPTHDR void diff --git a/pathtrace.c b/pathtrace.c index fdb13ba..91a55dc 100644 --- a/pathtrace.c +++ b/pathtrace.c @@ -188,7 +188,6 @@ pathtrace_match(struct tcb *tcp) * other than test arg[0]. */ - if (s->sys_func == sys_dup2 || s->sys_func == sys_dup3 || s->sys_func == sys_sendfile || diff --git a/process.c b/process.c index 20cfe20..f6d5922 100644 --- a/process.c +++ b/process.c @@ -49,7 +49,6 @@ #include #include - #ifdef HAVE_SYS_REG_H # include # ifndef PTRACE_PEEKUSR @@ -239,7 +238,6 @@ static const struct xlat prctl_options[] = { { 0, NULL }, }; - static const char * unalignctl_string(unsigned int ctl) { @@ -261,7 +259,6 @@ unalignctl_string(unsigned int ctl) return buf; } - int sys_prctl(struct tcb *tcp) { @@ -349,7 +346,6 @@ sys_prctl(struct tcb *tcp) } #endif /* HAVE_PRCTL */ - int sys_sethostname(struct tcb *tcp) { @@ -385,7 +381,6 @@ sys_setdomainname(struct tcb *tcp) return 0; } - int sys_exit(struct tcb *tcp) { @@ -401,8 +396,6 @@ sys_exit(struct tcb *tcp) return 0; } - - /* defines copied from linux/sched.h since we can't include that * ourselves (it conflicts with *lots* of libc includes) */ @@ -666,7 +659,6 @@ change_syscall(struct tcb *tcp, int new) return -1; } - int internal_fork(struct tcb *tcp) { @@ -695,9 +687,6 @@ internal_fork(struct tcb *tcp) return 0; } - - - int sys_vfork(struct tcb *tcp) { @@ -706,9 +695,6 @@ sys_vfork(struct tcb *tcp) return 0; } - - - int sys_getuid(struct tcb *tcp) { if (exiting(tcp)) @@ -795,7 +781,6 @@ sys_getresgid(struct tcb *tcp) return 0; } - int sys_setreuid(struct tcb *tcp) { @@ -837,7 +822,6 @@ sys_setresgid(struct tcb *tcp) return 0; } - int sys_setgroups(struct tcb *tcp) { @@ -1121,8 +1105,6 @@ sys_setpgid(struct tcb *tcp) return 0; } - - static void printargv(struct tcb *tcp, long addr) { @@ -1208,7 +1190,6 @@ sys_execve(struct tcb *tcp) return 0; } - #if defined(TCB_WAITEXECVE) int internal_exec(struct tcb *tcp) @@ -1276,7 +1257,6 @@ static const struct xlat wait4_options[] = { # define WCOREDUMP(status) ((status) & 0200) #endif - #ifndef W_STOPCODE #define W_STOPCODE(sig) ((sig) << 8 | 0x7f) #endif @@ -1371,8 +1351,6 @@ printwaitn(struct tcb *tcp, int n, int bitness) return 0; } - - int sys_waitpid(struct tcb *tcp) { @@ -1393,7 +1371,6 @@ sys_osf_wait4(struct tcb *tcp) } #endif - static const struct xlat waitid_types[] = { { P_PID, "P_PID" }, #ifdef P_PPID @@ -1455,7 +1432,6 @@ sys_waitid(struct tcb *tcp) return 0; } - int sys_alarm(struct tcb *tcp) { @@ -1493,7 +1469,6 @@ sys_uname(struct tcb *tcp) return 0; } - static const struct xlat ptrace_cmds[] = { { PTRACE_TRACEME, "PTRACE_TRACEME" }, { PTRACE_PEEKTEXT, "PTRACE_PEEKTEXT" }, @@ -2463,7 +2438,6 @@ const struct xlat struct_user_offsets[] = { # endif # endif /* !defined(many arches) */ - # ifndef HPPA { sizeof(struct user), "sizeof(struct user)" }, # endif @@ -2570,7 +2544,6 @@ sys_ptrace(struct tcb *tcp) return 0; } - # ifndef FUTEX_CMP_REQUEUE # define FUTEX_CMP_REQUEUE 4 # endif @@ -2868,7 +2841,6 @@ sys_arch_prctl(struct tcb *tcp) } # endif /* X86_64 */ - int sys_getcpu(struct tcb *tcp) { diff --git a/quota.c b/quota.c index 86600e9..638beb6 100644 --- a/quota.c +++ b/quota.c @@ -33,7 +33,6 @@ #include "defs.h" - #include #define SUBCMDMASK 0x00ff diff --git a/resource.c b/resource.c index 8f3ca1a..1aaf7d7 100644 --- a/resource.c +++ b/resource.c @@ -249,7 +249,6 @@ sys_setrlimit64(struct tcb *tcp) } #endif /* _LFS64_LARGEFILES || HAVE_LONG_LONG_RLIM_T */ - static const struct xlat usagewho[] = { { RUSAGE_SELF, "RUSAGE_SELF" }, { RUSAGE_CHILDREN, "RUSAGE_CHILDREN" }, @@ -378,8 +377,6 @@ sys_osf_getrusage(struct tcb *tcp) } #endif /* ALPHA */ - - int sys_sysinfo(struct tcb *tcp) { @@ -406,7 +403,6 @@ sys_sysinfo(struct tcb *tcp) return 0; } - static const struct xlat priorities[] = { { PRIO_PROCESS, "PRIO_PROCESS" }, { PRIO_PGRP, "PRIO_PGRP" }, @@ -442,7 +438,6 @@ sys_nice(struct tcb *tcp) return 0; } - int sys_times(struct tcb *tcp) { diff --git a/signal.c b/signal.c index 4f7daf3..baaac7c 100644 --- a/signal.c +++ b/signal.c @@ -40,7 +40,6 @@ #include #include - #ifdef HAVE_SYS_REG_H # include # ifndef PTRACE_PEEKUSR @@ -62,8 +61,6 @@ # undef pt_all_user_regs #endif - - #ifdef IA64 # include #endif @@ -376,7 +373,6 @@ print_sigset(struct tcb *tcp, long addr, int rt) printsigmask(&ss, rt); } - #ifndef ILL_ILLOPC #define ILL_ILLOPC 1 /* illegal opcode */ #define ILL_ILLOPN 2 /* illegal operand */ @@ -509,8 +505,6 @@ typedef struct siginfo #endif - - static const struct xlat siginfo_codes[] = { #ifdef SI_KERNEL { SI_KERNEL, "SI_KERNEL" }, @@ -770,9 +764,6 @@ printsiginfo(siginfo_t *sip, int verbose) tprints("}"); } - - - int sys_sigsetmask(struct tcb *tcp) { @@ -791,8 +782,6 @@ sys_sigsetmask(struct tcb *tcp) return 0; } - - #ifdef HAVE_SIGACTION struct old_sigaction { @@ -814,7 +803,6 @@ sys_sigaction(struct tcb *tcp) sigset_t sigset; struct old_sigaction sa; - if (entering(tcp)) { printsignal(tcp->u_arg[0]); tprints(", "); @@ -898,10 +886,8 @@ sys_signal(struct tcb *tcp) return 0; } - #endif /* HAVE_SIGACTION */ - int sys_sigreturn(struct tcb *tcp) { @@ -1156,8 +1142,6 @@ static const struct xlat sigaltstack_flags[] = { { 0, NULL }, }; - - static int print_stack_t(struct tcb *tcp, unsigned long addr) { @@ -1240,7 +1224,6 @@ sys_kill(struct tcb *tcp) return 0; } - int sys_tgkill(struct tcb *tcp) { @@ -1267,8 +1250,6 @@ sys_sigpending(struct tcb *tcp) return 0; } - - int sys_rt_sigprocmask(struct tcb *tcp) { @@ -1301,7 +1282,6 @@ sys_rt_sigprocmask(struct tcb *tcp) return 0; } - /* Structure describing the action to be taken when a signal arrives. */ struct new_sigaction { @@ -1320,7 +1300,6 @@ struct new_sigaction32 uint32_t sa_mask[2 * (NSIG / sizeof(long) ? NSIG / sizeof(long) : 1)]; }; - int sys_rt_sigaction(struct tcb *tcp) { diff --git a/sock.c b/sock.c index 25e47a9..ec20223 100644 --- a/sock.c +++ b/sock.c @@ -61,7 +61,6 @@ static const struct xlat iffflags[] = { { 0, NULL } }; - static void print_addr(struct tcb *tcp, long addr, struct ifreq *ifr) { diff --git a/strace.c b/strace.c index ec3068a..977c929 100644 --- a/strace.c +++ b/strace.c @@ -62,12 +62,10 @@ # include #endif - extern char **environ; extern int optind; extern char *optarg; - int debug = 0, followfork = 0; unsigned int ptrace_setoptions = 0; /* Which WSTOPSIG(status) value marks syscall traps? */ @@ -153,7 +151,6 @@ static volatile sig_atomic_t interrupted; static volatile int interrupted; #endif - static void usage(FILE *ofp, int exitval) { @@ -284,7 +281,6 @@ void die_out_of_memory(void) error_msg_and_die("Out of memory"); } - /* Glue for systems without a MMU that cannot provide fork() */ #ifdef HAVE_FORK # define strace_vforked 0 @@ -1007,7 +1003,6 @@ test_ptrace_seize(void) # define test_ptrace_seize() ((void)0) # endif - /* Noinline: don't want main to have struct utsname permanently on stack */ static void __attribute__ ((noinline)) get_os_release(void) @@ -1381,7 +1376,6 @@ alloc_tcb(int pid, int command_options_parsed) error_msg_and_die("bug in alloc_tcb"); } - static struct tcb * pid2tcb(int pid) { @@ -1399,7 +1393,6 @@ pid2tcb(int pid) return NULL; } - void droptcb(struct tcb *tcp) { @@ -1410,7 +1403,6 @@ droptcb(struct tcb *tcp) if (debug) fprintf(stderr, "dropped tcb for pid %d, %d remain\n", tcp->pid, nprocs); - if (outfname && followfork > 1 && tcp->outf) fclose(tcp->outf); @@ -1510,7 +1502,6 @@ detach(struct tcb *tcp) } } - if (!qflag) fprintf(stderr, "Process %u detached\n", tcp->pid); @@ -1519,7 +1510,6 @@ detach(struct tcb *tcp) return error; } - static void cleanup(void) { @@ -1609,7 +1599,6 @@ strsignal(int sig) #endif /* HAVE_STRSIGNAL */ - static int trace(void) { @@ -2025,7 +2014,6 @@ trace(void) return 0; } - void tprintf(const char *fmt, ...) { diff --git a/stream.c b/stream.c index 6e0d38d..c635352 100644 --- a/stream.c +++ b/stream.c @@ -60,7 +60,6 @@ static const struct xlat msgflags[] = { { 0, NULL }, }; - static void printstrbuf(struct tcb *tcp, struct strbuf *sbp, int getting) { @@ -242,8 +241,6 @@ sys_getpmsg(struct tcb *tcp) } #endif /* SYS_getpmsg */ - - #ifdef HAVE_SYS_POLL_H static const struct xlat pollflags[] = { diff --git a/syscall.c b/syscall.c index 3f69c18..7360f4f 100644 --- a/syscall.c +++ b/syscall.c @@ -136,7 +136,6 @@ static const struct sysent sysent2[] = { #undef NF #undef MA - /* * `ioctlent.h' may be generated from `ioctlent.raw' by the auxiliary * program `ioctlsort', such that the list is sorted by the `code' field. @@ -145,7 +144,6 @@ static const struct sysent sysent2[] = { * in "/usr/include". */ - static const char *const errnoent0[] = { #include "errnoent.h" }; @@ -195,7 +193,6 @@ enum { nioctlents2 = ARRAY_SIZE(ioctlent2) }; int qual_flags2[MAX_QUALS]; #endif - const struct sysent *sysent; const char *const *errnoent; const char *const *signalent; diff --git a/system.c b/system.c index 4597af5..61a614a 100644 --- a/system.c +++ b/system.c @@ -381,10 +381,6 @@ sys_cacheflush(struct tcb *tcp) } #endif /* SH */ - - - - #ifdef SYS_capget static const struct xlat capabilities[] = { @@ -433,7 +429,6 @@ static const struct xlat capabilities[] = { { 0, NULL }, }; - int sys_capget(struct tcb *tcp) { @@ -931,8 +926,6 @@ sys_sysctl(struct tcb *tcp) return 0; } - - #ifdef MIPS #ifndef __NEW_UTS_LEN diff --git a/term.c b/term.c index 2e86f2e..0e8bb13 100644 --- a/term.c +++ b/term.c @@ -168,7 +168,6 @@ static const struct xlat modem_flags[] = { { 0, NULL, }, }; - int term_ioctl(struct tcb *tcp, long code, long arg) { struct termios tios; diff --git a/time.c b/time.c index 1a134ae..066cf40 100644 --- a/time.c +++ b/time.c @@ -195,7 +195,6 @@ sys_gettimeofday(struct tcb *tcp) return 0; } - #ifdef ALPHA int sys_osf_gettimeofday(struct tcb *tcp) @@ -343,7 +342,6 @@ sys_getitimer(struct tcb *tcp) return 0; } - #ifdef ALPHA int sys_osf_getitimer(struct tcb *tcp) @@ -397,7 +395,6 @@ sys_osf_setitimer(struct tcb *tcp) } #endif - static const struct xlat adjtimex_modes[] = { { 0, "0" }, #ifdef ADJ_OFFSET diff --git a/util.c b/util.c index d71e9db..640f246 100644 --- a/util.c +++ b/util.c @@ -69,7 +69,6 @@ # undef pt_all_user_regs #endif - #if defined(SPARC64) # undef PTRACE_GETREGS # define PTRACE_GETREGS PTRACE_GETREGS64 @@ -760,7 +759,6 @@ dumpstr(struct tcb *tcp, long addr, int len) } } - #ifdef HAVE_PROCESS_VM_READV /* C library supports this, but the kernel might not. */ static bool process_vm_readv_not_supported = 0; @@ -798,7 +796,6 @@ static bool process_vm_readv_not_supported = 1; #endif /* end of hack */ - #define PAGMASK (~(PAGSIZ - 1)) /* * move `len' bytes of data from process `pid' @@ -1027,7 +1024,6 @@ upeek(struct tcb *tcp, long off, long *res) return 0; } - void printcall(struct tcb *tcp) { @@ -1186,13 +1182,11 @@ printcall(struct tcb *tcp) #endif /* architecture */ } - /* * These #if's are huge, please indent them correctly. * It's easy to get confused otherwise. */ - #include "syscall.h" #include -- cgit v1.2.3