* signal.c: Whitespace, comment, and style fixes, no code changes.
* file.c: Ditto.
* time.c: Ditto.
* process.c: Ditto.
* resource.c: Ditto.
diff --git a/time.c b/time.c
index af68eee..01241d2 100644
--- a/time.c
+++ b/time.c
@@ -70,9 +70,8 @@
tprintf("NULL");
else if (!verbose(tcp))
tprintf("%#lx", addr);
- else
- {
- int rc;
+ else {
+ int rc;
if (bitness == BITNESS_32
#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
@@ -92,8 +91,7 @@
else
tprint_timeval32(tcp, &tv);
}
- } else
- {
+ } else {
struct timeval tv;
if ((rc = umove(tcp, addr, &tv)) >= 0) {
@@ -107,7 +105,6 @@
tprint_timeval(tcp, &tv);
}
}
-
if (rc < 0)
tprintf("{...}");
}
@@ -120,9 +117,8 @@
strcpy(buf, "NULL");
else if (!verbose(tcp))
sprintf(buf, "%#lx", addr);
- else
- {
- int rc;
+ else {
+ int rc;
if (bitness == BITNESS_32
#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
@@ -135,8 +131,7 @@
if ((rc = umove(tcp, addr, &tv)) >= 0)
sprintf(buf, "{%u, %u}",
tv.tv_sec, tv.tv_usec);
- } else
- {
+ } else {
struct timeval tv;
if ((rc = umove(tcp, addr, &tv)) >= 0)
@@ -144,77 +139,68 @@
(unsigned long) tv.tv_sec,
(unsigned long) tv.tv_usec);
}
-
if (rc < 0)
strcpy(buf, "{...}");
}
}
-void print_timespec (struct tcb *tcp, long addr)
+void print_timespec(struct tcb *tcp, long addr)
{
if (addr == 0)
tprintf("NULL");
else if (!verbose(tcp))
tprintf("%#lx", addr);
else {
- int rc;
+ int rc;
#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
- if (personality_wordsize[current_personality] == 4)
- {
+ if (personality_wordsize[current_personality] == 4) {
struct timeval32 tv;
if ((rc = umove(tcp, addr, &tv)) >= 0)
tprintf("{%u, %u}",
tv.tv_sec, tv.tv_usec);
} else
- {
#endif
+ {
struct timespec ts;
if ((rc = umove(tcp, addr, &ts)) >= 0)
tprintf("{%lu, %lu}",
(unsigned long) ts.tv_sec,
(unsigned long) ts.tv_nsec);
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
}
-#endif
-
if (rc < 0)
tprintf("{...}");
}
}
-void sprint_timespec (char *buf, struct tcb *tcp, long addr)
+void sprint_timespec(char *buf, struct tcb *tcp, long addr)
{
if (addr == 0)
strcpy(buf, "NULL");
else if (!verbose(tcp))
sprintf(buf, "%#lx", addr);
else {
- int rc;
+ int rc;
#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
- if (personality_wordsize[current_personality] == 4)
- {
+ if (personality_wordsize[current_personality] == 4) {
struct timeval32 tv;
if ((rc = umove(tcp, addr, &tv)) >= 0)
sprintf(buf, "{%u, %u}",
tv.tv_sec, tv.tv_usec);
} else
- {
#endif
+ {
struct timespec ts;
if ((rc = umove(tcp, addr, &ts)) >= 0)
sprintf(buf, "{%lu, %lu}",
(unsigned long) ts.tv_sec,
(unsigned long) ts.tv_nsec);
-#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
}
-#endif
-
if (rc < 0)
strcpy(buf, "{...}");
}
@@ -267,19 +253,18 @@
sys_osf_gettimeofday(tcp)
struct tcb *tcp;
{
- if (exiting(tcp)) {
- if (syserror(tcp)) {
- tprintf("%#lx, %#lx",
- tcp->u_arg[0], tcp->u_arg[1]);
- return 0;
- }
- printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
+ if (exiting(tcp)) {
+ if (syserror(tcp)) {
+ tprintf("%#lx, %#lx", tcp->u_arg[0], tcp->u_arg[1]);
+ return 0;
+ }
+ printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
#ifndef SVR4
- tprintf(", ");
- printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
+ tprintf(", ");
+ printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
#endif /* !SVR4 */
- }
- return 0;
+ }
+ return 0;
}
#endif
@@ -302,14 +287,14 @@
sys_osf_settimeofday(tcp)
struct tcb *tcp;
{
- if (entering(tcp)) {
- printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
+ if (entering(tcp)) {
+ printtv_bitness(tcp, tcp->u_arg[0], BITNESS_32, 0);
#ifndef SVR4
- tprintf(", ");
- printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
+ tprintf(", ");
+ printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32, 0);
#endif /* !SVR4 */
- }
- return 0;
+ }
+ return 0;
}
#endif
@@ -358,9 +343,8 @@
tprintf("NULL");
else if (!verbose(tcp))
tprintf("%#lx", addr);
- else
- {
- int rc;
+ else {
+ int rc;
if (bitness == BITNESS_32
#if defined(LINUX) && SUPPORTED_PERSONALITIES > 1
@@ -368,8 +352,7 @@
#endif
)
{
- struct
- {
+ struct {
struct timeval32 it_interval, it_value;
} itv;
@@ -380,8 +363,7 @@
tprint_timeval32(tcp, &itv.it_value);
tprintf("}");
}
- } else
- {
+ } else {
struct itimerval itv;
if ((rc = umove(tcp, addr, &itv)) >= 0) {
@@ -392,7 +374,6 @@
tprintf("}");
}
}
-
if (rc < 0)
tprintf("{...}");
}
@@ -423,16 +404,16 @@
sys_osf_getitimer(tcp)
struct tcb *tcp;
{
- if (entering(tcp)) {
- printxval(which, tcp->u_arg[0], "ITIMER_???");
- tprintf(", ");
- } else {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[1]);
- else
- printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
- }
- return 0;
+ if (entering(tcp)) {
+ printxval(which, tcp->u_arg[0], "ITIMER_???");
+ tprintf(", ");
+ } else {
+ if (syserror(tcp))
+ tprintf("%#lx", tcp->u_arg[1]);
+ else
+ printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
+ }
+ return 0;
}
#endif
@@ -459,18 +440,18 @@
sys_osf_setitimer(tcp)
struct tcb *tcp;
{
- if (entering(tcp)) {
- printxval(which, tcp->u_arg[0], "ITIMER_???");
- tprintf(", ");
- printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
- tprintf(", ");
- } else {
- if (syserror(tcp))
- tprintf("%#lx", tcp->u_arg[2]);
- else
- printitv_bitness(tcp, tcp->u_arg[2], BITNESS_32);
- }
- return 0;
+ if (entering(tcp)) {
+ printxval(which, tcp->u_arg[0], "ITIMER_???");
+ tprintf(", ");
+ printitv_bitness(tcp, tcp->u_arg[1], BITNESS_32);
+ tprintf(", ");
+ } else {
+ if (syserror(tcp))
+ tprintf("%#lx", tcp->u_arg[2]);
+ else
+ printitv_bitness(tcp, tcp->u_arg[2], BITNESS_32);
+ }
+ return 0;
}
#endif
@@ -574,8 +555,7 @@
static int
tprint_timex32(struct tcb *tcp, long addr)
{
- struct
- {
+ struct {
unsigned int modes;
int offset;
int freq;
@@ -761,17 +741,14 @@
static void
printsigevent32(struct tcb *tcp, long arg)
{
- struct
- {
+ struct {
int sigev_value;
int sigev_signo;
int sigev_notify;
- union
- {
+ union {
int tid;
- struct
- {
+ struct {
int function, attribute;
} thread;
} un;
@@ -779,8 +756,7 @@
if (umove(tcp, arg, &sev) < 0)
tprintf("{...}");
- else
- {
+ else {
tprintf("{%#x, ", sev.sigev_value);
if (sev.sigev_notify == SIGEV_SIGNAL)
tprintf("%s, ", signame(sev.sigev_signo));