Make initial tcb allocation more readable. No logic changes.

* strace.c (main): Make initial tcb allocation more readable.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

diff --git a/strace.c b/strace.c
index ae8fb6c2e1369cbb49198258efd0b114f283d991..61d012164cdb6028d748045001109096e70e76fd 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -881,14 +881,14 @@ main(int argc, char *argv[])
 
        /* Allocate the initial tcbtab.  */
        tcbtabsize = argc;      /* Surely enough for all -p args.  */
-       tcbtab = calloc(tcbtabsize, sizeof tcbtab[0]);
+       tcbtab = calloc(tcbtabsize, sizeof(tcbtab[0]));
        if (tcbtab == NULL)
                error_msg_and_die("Out of memory");
-       tcbtab[0] = calloc(tcbtabsize, sizeof tcbtab[0][0]);
-       if (tcbtab[0] == NULL)
+       tcp = calloc(tcbtabsize, sizeof(*tcp));
+       if (tcp == NULL)
                error_msg_and_die("Out of memory");
-       for (tcp = tcbtab[0]; tcp < &tcbtab[0][tcbtabsize]; ++tcp)
-               tcbtab[tcp - tcbtab[0]] = &tcbtab[0][tcp - tcbtab[0]];
+       for (c = 0; c < tcbtabsize; c++)
+               tcbtab[c] = tcp++;
 
        outf = stderr;
        interactive = 1;