From: Dmitry V. Levin Date: Wed, 8 Jul 2009 11:21:17 +0000 (+0000) Subject: Cleanup trailing whitespaces and indentation that uses spaces before tabs X-Git-Tag: v4.5.19~47 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=414fe7d4d284e22d7855c5367f17dbc0714738d9;p=strace Cleanup trailing whitespaces and indentation that uses spaces before tabs Correct spacing to fix warnings reported by git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD Signed-off-by: Dmitry V. Levin --- diff --git a/ChangeLog b/ChangeLog index d3b64b0e..b5262ad3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2009-07-08 Dmitry V. Levin + + Clean up spacing to fix warnings reported by git diff --check. + * ChangeLog: Fix spaces before tab in indent. + * bjm.c: Likewise. + * debian/changelog: Likewise. + * strace-graph: Likewise. + * syscall.c: Likewise. + * INSTALL: Fix trailing blank lines. + * README-linux: Likewise. + * README-svr4: Likewise. + * linux/sparc/gen.pl: Likewise. + * linux/sparc/syscall1.h: Likewise. + * linux/sparc64/syscall1.h: Likewise. + * linux/x86_64/gentab.pl: Likewise. + * sunos4/syscall.h: Likewise. + * test/Makefile: Likewise. + * debian/rules: Fix trailing whitespaces. + * desc.c: Likewise. + * svr4/syscallent.h: Likewise. + * test/childthread.c: Likewise. + * test/leaderkill.c: Likewise. + 2009-07-07 Dmitry V. Levin * .cvsignore: Remove. @@ -220,7 +243,7 @@ (fork_tcb): Change return type to void - it can't fail now. * strace.c: Move extern declarations out of function bodies. Change all callsites of alloctcb(), alloc_tcb() and - fork_tcb(), removing now-redundant error checks. + fork_tcb(), removing now-redundant error checks. (expand_tcbtab): Change return type to void - it can't fail now. On failure to expand, print a message, clean up, and exit. (alloc_tcb): On failure to expand, print a message, clean up, and exit. @@ -4707,7 +4730,7 @@ 1999-12-27 Morten Welinder * syscall.c (lookup_signal, lookup_desc): isdigit requires an - _unsigned_ char parameter. + _unsigned_ char parameter. 2000-02-14 Wichert Akkerman @@ -5020,13 +5043,13 @@ Mon May 20 23:17:14 1996 J. Richard Sladkey * aclocal.m4 (AC_STRUCT_MSG_CONTROL): New macro. * configure.in: Add call to AC_STRUCT_MSG_CONTROL. * net.c (printmsghdr): Handle BSD 4.3 and 4.4 msghdr members - differently. + differently. Reported by Henrik Storner . * configure.in: (AC_CHECK_{HEADERS,FUNCS}): Add checks for - sys/filio.h and sys/stream.h and remove check for poll. + sys/filio.h and sys/stream.h and remove check for poll. * desc.c (decode_select, sys_select, sys_oldselect) [LINUX]: - Handle old and new styles of argument passing for select on Linux. + Handle old and new styles of argument passing for select on Linux. * ioctl.c, stream.c: Conditionalize stream code on presence of sys/stream.h instead of poll because glibc implements poll but not the rest of the stream interface. @@ -5050,17 +5073,17 @@ Mon May 20 01:19:36 1996 J. Richard Sladkey * syscall.c (nerrnos{0,2}): Correct size computation. * Makefile.in: Remove dependencies and rules relating to files - normally found in the os directory. Because of the new scheme we - don't know precisely where they come from. Sigh. + normally found in the os directory. Because of the new scheme we + don't know precisely where they come from. Sigh. * signalent.sh: Make it work for sunos4, linux, and svr4. * {sunos4,linux{,/alpha},svr4}/Makefile.in: Make rules correspond - to traditional make syntax. Add signalent.h to files which can - unconditionally be rebuilt. Prevent signalent.h from being - unconditionally being rebuilt since it's customized. + to traditional make syntax. Add signalent.h to files which can + unconditionally be rebuilt. Prevent signalent.h from being + unconditionally being rebuilt since it's customized. * {sunos4,linux{,/alpha},svr4}/{ioctlent,errnoent,signalent}.h: - Use versions built by {ioctlent,errnoent,signaltent}.sh. - * sunos4/ioctlent.sh: Work around sprintf troubles with SunOS - 4.1.4 and gcc 2.7.2. + Use versions built by {ioctlent,errnoent,signaltent}.sh. + * sunos4/ioctlent.sh: Work around sprintf troubles with SunOS + 4.1.4 and gcc 2.7.2. Sun May 19 17:14:09 1996 J. Richard Sladkey @@ -5085,8 +5108,8 @@ Sun May 19 01:12:28 1996 J. Richard Sladkey * defs.h (SUPPORTED_PERSONALITES, DEFAULT_PERSONALITY): New. * syscall.c (set_personality): New. * strace.c (main): Call set_personality. - * defs.h, syscall.c, ioctl.c, signal.c: Make sysent, errnoent, - ioctlent, and signalent indirect pointers and redirect them + * defs.h, syscall.c, ioctl.c, signal.c: Make sysent, errnoent, + ioctlent, and signalent indirect pointers and redirect them based on personality. * {sunos4,svr4,linux{,/alpha}}/signalent.h: New files. Suggested by Tom Dyas . @@ -5283,20 +5306,20 @@ Tue Jul 4 00:30:34 1995 Rick Sladkey * version.c: Version 3.0.5 is released. * desc.c, resource.c, strace.c, syscall.c, time.c: Cast tv_sec and - tv_usec members to long when using printf. + tv_usec members to long when using printf. * ipc.c: Omit define of __KERNEL__. ({MSG,SEM,SHM}_{STAT,INFO}): Explicitly define those things we - want which __KERNEL__ used to provide. + want which __KERNEL__ used to provide. (sys_msgrcv): Change reference to ipc_kludge structure to look-alike ipc_wrapper to avoid dependence on __KERNEL__. mem.c (mmap_flags) [MAP_{GROWSDOWN,DENYWRITE,EXECUTABLE}]: Add - Linux specific options. + Linux specific options. syscall.c: Use SYS_ERRLIST_DECLARED instead of guessing. - [E{RESTART{SYS,NO{INTR,HAND}},NOIOCTLCMD}]: Explicitly define - instead of depending of __KERNEL__. + [E{RESTART{SYS,NO{INTR,HAND}},NOIOCTLCMD}]: Explicitly define + instead of depending of __KERNEL__. term.c: Cast c_{i,o,c,l}flag to long when using printf. diff --git a/INSTALL b/INSTALL index a2c8722c..7a11ed05 100644 --- a/INSTALL +++ b/INSTALL @@ -178,4 +178,3 @@ operates. script, and exit. `configure' also accepts some other, not widely useful, options. - diff --git a/README-linux b/README-linux index b52cb8f4..62df2585 100644 --- a/README-linux +++ b/README-linux @@ -29,4 +29,3 @@ There are three ways to compile strace with other kernel headers: * you can link /usr/include/linux and /usr/include/asm to the corresponding directories in your kernel source-tree. - diff --git a/README-svr4 b/README-svr4 index aaf5dff8..387d24dd 100644 --- a/README-svr4 +++ b/README-svr4 @@ -19,4 +19,3 @@ to the config.h file. This forces strace to check whether the last process has finished a system call before polling other processes for events. Wichert Akkerman - diff --git a/bjm.c b/bjm.c index f56e48f4..c8c2395a 100644 --- a/bjm.c +++ b/bjm.c @@ -123,8 +123,8 @@ struct tcb *tcp; umove(tcp, tcp->u_arg[4], &ret); tprintf(", %Zu", ret); } else if ((tcp->u_arg[1]==QM_MODULES) || - (tcp->u_arg[1]==QM_DEPS) || - (tcp->u_arg[1]==QM_REFS)) { + (tcp->u_arg[1]==QM_DEPS) || + (tcp->u_arg[1]==QM_REFS)) { size_t ret; umove(tcp, tcp->u_arg[4], &ret); diff --git a/debian/changelog b/debian/changelog index 0141a4b1..7f1dbf4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -569,7 +569,7 @@ strace (3.1-14) unstable; urgency=low strace (3.1-13) unstable; urgency=low * Corrected error on PowerPC patch that broke other archictectures - (Bug# 13837) + (Bug# 13837) -- Wichert Akkerman Tue, 14 Oct 1997 15:41:29 +0200 diff --git a/debian/rules b/debian/rules index 843f3176..791f5efb 100755 --- a/debian/rules +++ b/debian/rules @@ -46,11 +46,11 @@ binary-indep: binary-arch: build checkroot test -f stamp-build || make $(MFLAGS) -f debian/rules build - + # prepare 64bit executable and manpage, if it has been built test -f stamp-build64 && ( mv build64/strace build64/strace64 ; \ cp strace.1 strace64.1 ) || true - + dh_testdir -s dh_testroot -s dh_installdirs -s diff --git a/desc.c b/desc.c index e01b9acc..383107e3 100644 --- a/desc.c +++ b/desc.c @@ -872,7 +872,7 @@ sys_io_cancel(struct tcb *tcp) tprintf("{%p, %p, %ld, %ld}", event.data, event.obj, event.res, event.res2); - else + else #endif tprintf("{...}"); } diff --git a/linux/sparc/gen.pl b/linux/sparc/gen.pl index 1a320ee6..13713371 100644 --- a/linux/sparc/gen.pl +++ b/linux/sparc/gen.pl @@ -35,4 +35,3 @@ for ($i = 0; $i < $index; $i++){ $j++; print "\t{ $n\t$p\t$x\t$y },\t /* $j */\n"; } - diff --git a/linux/sparc/syscall1.h b/linux/sparc/syscall1.h index f6328a95..a4d7af33 100644 --- a/linux/sparc/syscall1.h +++ b/linux/sparc/syscall1.h @@ -498,4 +498,3 @@ extern int solaris_getcontext(), solaris_setcontext(); #define SOLARIS_setcontext (SOLARIS_context_subcall + 1) #define SOLARIS_context_nsubcalls 2 - diff --git a/linux/sparc64/syscall1.h b/linux/sparc64/syscall1.h index f6328a95..a4d7af33 100644 --- a/linux/sparc64/syscall1.h +++ b/linux/sparc64/syscall1.h @@ -498,4 +498,3 @@ extern int solaris_getcontext(), solaris_setcontext(); #define SOLARIS_setcontext (SOLARIS_context_subcall + 1) #define SOLARIS_context_nsubcalls 2 - diff --git a/linux/x86_64/gentab.pl b/linux/x86_64/gentab.pl index 41478809..2858e079 100644 --- a/linux/x86_64/gentab.pl +++ b/linux/x86_64/gentab.pl @@ -73,5 +73,3 @@ while () { } print SL "#define SYS_$name $num\n" } - - diff --git a/strace-graph b/strace-graph index a642e562..6a04ac2f 100755 --- a/strace-graph +++ b/strace-graph @@ -308,9 +308,9 @@ sub display_pid_trace { } elsif ($$elem[0] eq 'FORK') { if ($i == 1) { if ($lead =~ /-$/) { - display_pid_trace($$elem[1], "$lead--+--"); + display_pid_trace($$elem[1], "$lead--+--"); } else { - display_pid_trace($$elem[1], "$lead +--"); + display_pid_trace($$elem[1], "$lead +--"); } } elsif ($i == @seq) { display_pid_trace($$elem[1], "$lead `--"); @@ -336,4 +336,3 @@ sub display_trace { display_pid_trace($startpid, ""); } - diff --git a/sunos4/syscall.h b/sunos4/syscall.h index 57e877af..98b7e511 100644 --- a/sunos4/syscall.h +++ b/sunos4/syscall.h @@ -172,4 +172,3 @@ int sys_putmsg(); int sys_poll(); int sys_vpixsys(); /* VP/ix system calls */ - diff --git a/svr4/syscallent.h b/svr4/syscallent.h index 239d6b0b..d8e5a125 100644 --- a/svr4/syscallent.h +++ b/svr4/syscallent.h @@ -823,5 +823,5 @@ { -1, TF, sys_aioaread64, "aioaread64" }, /* 417 */ { -1, TF, sys_aioawrite64, "aioawrite64" }, /* 418 */ { -1, TF, sys_aiocancel64, "aiocancel64" }, /* 419 */ - { -1, TF, sys_aiofsync, "aiofsync" }, /* 420 */ + { -1, TF, sys_aiofsync, "aiofsync" }, /* 420 */ #endif diff --git a/syscall.c b/syscall.c index 2605f91a..26b1a9d7 100644 --- a/syscall.c +++ b/syscall.c @@ -2069,20 +2069,20 @@ syscall_enter(struct tcb *tcp) if (tcp->scno >= 0 && tcp->scno < nsyscalls && sysent[tcp->scno].nargs != -1) nargs = tcp->u_nargs = sysent[tcp->scno].nargs; else - nargs = tcp->u_nargs = MAX_ARGS; + nargs = tcp->u_nargs = MAX_ARGS; if(nargs > 4) { - if(upeek(tcp, REG_SP, &sp) < 0) - return -1; + if(upeek(tcp, REG_SP, &sp) < 0) + return -1; for(i = 0; i < 4; i++) { - if (upeek(tcp, REG_A0 + i, &tcp->u_arg[i])<0) - return -1; + if (upeek(tcp, REG_A0 + i, &tcp->u_arg[i])<0) + return -1; } umoven(tcp, sp+16, (nargs-4) * sizeof(tcp->u_arg[0]), (char *)(tcp->u_arg + 4)); } else { - for(i = 0; i < nargs; i++) { - if (upeek(tcp, REG_A0 + i, &tcp->u_arg[i]) < 0) - return -1; + for(i = 0; i < nargs; i++) { + if (upeek(tcp, REG_A0 + i, &tcp->u_arg[i]) < 0) + return -1; } } } @@ -2186,8 +2186,8 @@ syscall_enter(struct tcb *tcp) * in the trap number matches the number strace expects. */ /* - assert(sysent[tcp->scno].nargs < - sizeof(syscall_regs)/sizeof(syscall_regs[0])); + assert(sysent[tcp->scno].nargs < + sizeof(syscall_regs)/sizeof(syscall_regs[0])); */ tcp->u_nargs = sysent[tcp->scno].nargs; diff --git a/test/Makefile b/test/Makefile index 283094f4..3e7236b9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -10,4 +10,3 @@ childthread: LDFLAGS += -pthread clean distclean: rm -f clone vfork fork sig leaderkill *.o core - diff --git a/test/childthread.c b/test/childthread.c index c580db29..e89fb145 100644 --- a/test/childthread.c +++ b/test/childthread.c @@ -1,7 +1,7 @@ /* Test exit of a child of a TCB_EXITING child where the toplevel process starts * waiting on it. The middle one gets detached and strace must update the * toplevel process'es number of attached children to 0. - * + * * gcc -o test/childthread test/childthread.c -Wall -ggdb2 -pthread;./strace -f ./test/childthread * It must print: write(1, "OK\n", ... */ diff --git a/test/leaderkill.c b/test/leaderkill.c index 67d5de15..ebb6ad1c 100644 --- a/test/leaderkill.c +++ b/test/leaderkill.c @@ -1,7 +1,7 @@ /* Test handle_group_exit () handling of a thread leader still alive with its * thread child calling exit_group () and proper passing of the process exit * code to the process parent of this whole thread group. - * + * * gcc -o test/leaderkill test/leaderkill.c -Wall -ggdb2 -pthread;./test/leaderkill & pid=$!;sleep 1;strace -o x -q ./strace -f -p $pid * It must print: write(1, "OK\n", ... */