]> granicus.if.org Git - strace/commitdiff
Cleanup trailing whitespaces and indentation that uses spaces before tabs
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 8 Jul 2009 11:21:17 +0000 (11:21 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 8 Jul 2009 14:57:27 +0000 (14:57 +0000)
Correct spacing to fix warnings reported by
git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
19 files changed:
ChangeLog
INSTALL
README-linux
README-svr4
bjm.c
debian/changelog
debian/rules
desc.c
linux/sparc/gen.pl
linux/sparc/syscall1.h
linux/sparc64/syscall1.h
linux/x86_64/gentab.pl
strace-graph
sunos4/syscall.h
svr4/syscallent.h
syscall.c
test/Makefile
test/childthread.c
test/leaderkill.c

index d3b64b0e53019f4ca6d1a59f5d16d8aab7b67f4f..b5262ad396acb465e59409d224f3c820f70789b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2009-07-08  Dmitry V. Levin  <ldv@altlinux.org>
+
+       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  <ldv@altlinux.org>
 
        * .cvsignore: Remove.
        (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.
 1999-12-27  Morten Welinder  <terra@diku.dk>
 
        * syscall.c (lookup_signal, lookup_desc): isdigit requires an
-       _unsigned_ char parameter.
+       _unsigned_ char parameter.
 
 2000-02-14 Wichert Akkerman <wakkerma@debian.org>
 
@@ -5020,13 +5043,13 @@ Mon May 20 23:17:14 1996  J. Richard Sladkey  <jrs@world.std.com>
        * 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 <storner@osiris.ping.dk>.
 
        * 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  <jrs@world.std.com>
        * 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  <jrs@world.std.com>
 
@@ -5085,8 +5108,8 @@ Sun May 19 01:12:28 1996  J. Richard Sladkey  <jrs@world.std.com>
        * 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 <tdyas@eden.rutgers.edu>.
@@ -5283,20 +5306,20 @@ Tue Jul  4 00:30:34 1995  Rick Sladkey  <jrs@world.std.com>
        * 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 a2c8722ccaff676071265013de37bdfb59f13704..7a11ed05e649db599fc6fbbdaed95a3aa5458271 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -178,4 +178,3 @@ operates.
      script, and exit.
 
 `configure' also accepts some other, not widely useful, options.
-
index b52cb8f4a148bba435f3963610ba632dff5d299b..62df2585163cc9068129dab5ac5fd310b9d91a23 100644 (file)
@@ -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.
-
index aaf5dff86969186977e05528260d6dc488dcf987..387d24dd8a01a8387eeb3bb1e1965e035c875268 100644 (file)
@@ -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 <wakkerma@debian.org>
-
diff --git a/bjm.c b/bjm.c
index f56e48f43de447d3bcf17d616d9ee1708c05b8bd..c8c2395ac3e03b72da40db4f6ce6875d5d4f7c39 100644 (file)
--- 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);
index 0141a4b1eb6ed628fdd101e1ca1aeeb5fc3c3a8f..7f1dbf4a1803dc36f287ade206d7148e282e5ecc 100644 (file)
@@ -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 <wakkerma@debian.org>  Tue, 14 Oct 1997 15:41:29 +0200
 
index 843f3176900fe126a9bbe6eda7aa42536ea4a468..791f5efbab4b32ab25d13037932ad914abddd5be 100755 (executable)
@@ -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 e01b9acc25147b9af05d3541052ca28f6543f326..383107e30d7056f71de7f9bb7ebeb8b3f0baf8fd 100644 (file)
--- 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("{...}");
                }
index 1a320ee65a81d10d3c0b407d555ad9e34c5d64d5..137133714d431fd0feaae97d28aaf3ceb4395dbd 100644 (file)
@@ -35,4 +35,3 @@ for ($i = 0; $i < $index; $i++){
     $j++;
     print "\t{ $n\t$p\t$x\t$y },\t /* $j */\n";
 }
-
index f6328a9515e06400ce5654a8c0c11f4806db817d..a4d7af33a30782321fa697310999687f9f274820 100644 (file)
@@ -498,4 +498,3 @@ extern int solaris_getcontext(), solaris_setcontext();
 #define SOLARIS_setcontext             (SOLARIS_context_subcall + 1)
 
 #define SOLARIS_context_nsubcalls      2
-
index f6328a9515e06400ce5654a8c0c11f4806db817d..a4d7af33a30782321fa697310999687f9f274820 100644 (file)
@@ -498,4 +498,3 @@ extern int solaris_getcontext(), solaris_setcontext();
 #define SOLARIS_setcontext             (SOLARIS_context_subcall + 1)
 
 #define SOLARIS_context_nsubcalls      2
-
index 414788097a8d485fa615b572622f61e9421c0c6b..2858e0795dda4eb27c9de936b5f6cf4f1f31fa67 100644 (file)
@@ -73,5 +73,3 @@ while (<S>) {
        }
        print SL "#define SYS_$name $num\n"
 }
-
-
index a642e562ec8b172399dca7d4a03d094856b16272..6a04ac2f5440b5d2b946bc9bd103e4d624dbd07f 100755 (executable)
@@ -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, "");
 }
-
index 57e877af18fd3a51ca7d617285cda45e7aad0911..98b7e5110aa3ad75810432cc88a1247ff4dd713e 100644 (file)
@@ -172,4 +172,3 @@ int sys_putmsg();
 int    sys_poll();
 
 int    sys_vpixsys();          /* VP/ix system calls */
-
index 239d6b0b1b39647418af3252a8a9fa460f062c28..d8e5a125e90372b8198ccc76c10b5f3f40d69d2b 100644 (file)
        { -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
index 2605f91ad34f0a2e79cc89b88c085ea4c1f46a0b..26b1a9d71e58b37ed6967e993ed1cc20488c5ebd 100644 (file)
--- 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;
index 283094f42ebca8e901fa2f9cf9e80c22a1e146ce..3e7236b9e9f9a688990f0016a9f4c80e851f0e8f 100644 (file)
@@ -10,4 +10,3 @@ childthread: LDFLAGS += -pthread
 
 clean distclean:
        rm -f clone vfork fork sig leaderkill *.o core
-
index c580db295621656d657773269ab0c3cd3431b854..e89fb1454011ee69a963a31f3b1584f9773a1789 100644 (file)
@@ -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", ...
  */
index 67d5de1579837f1e6565431e48425a702405fdd9..ebb6ad1cf4eb621e006c08cf7f1ee0489ca69b64 100644 (file)
@@ -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", ...
  */