Whitespace cleanups. no code changes.
* bjm.c: Fix tabulation (such as extra spaces before tabs),
convert punctuation where it deviates from prevalent form
elsewhere in strace code, convert sizeof and offsetof where
it deviates from from prevalent form, remove space between
function/macro/array names and (parameters) or [index],
add space between "if" and (condition), correct non-standard
or wrong indentaion.
* defs.h: Likewise
* desc.c: Likewise
* file.c: Likewise
* ipc.c: Likewise
* linux/arm/syscallent.h: Likewise
* linux/avr32/syscallent.h: Likewise
* linux/hppa/syscallent.h: Likewise
* linux/i386/syscallent.h: Likewise
* linux/ioctlsort.c: Likewise
* linux/m68k/syscallent.h: Likewise
* linux/microblaze/syscallent.h: Likewise
* linux/powerpc/syscallent.h: Likewise
* linux/s390/syscallent.h: Likewise
* linux/s390x/syscallent.h: Likewise
* linux/sh/syscallent.h: Likewise
* linux/sh64/syscallent.h: Likewise
* linux/tile/syscallent.h: Likewise
* linux/x86_64/syscallent.h: Likewise
* mem.c: Likewise
* net.c: Likewise
* pathtrace.c: Likewise
* process.c: Likewise
* signal.c: Likewise
* sock.c: Likewise
* strace.c: Likewise
* stream.c: Likewise
* sunos4/syscall.h: Likewise
* sunos4/syscallent.h: Likewise
* svr4/syscall.h: Likewise
* svr4/syscallent.h: Likewise
* syscall.c: Likewise
* system.c: Likewise
* test/childthread.c: Likewise
* test/leaderkill.c: Likewise
* test/skodic.c: Likewise
* time.c: Likewise
* util.c: Likewise
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
diff --git a/stream.c b/stream.c
index ed96501..d55beb5 100644
--- a/stream.c
+++ b/stream.c
@@ -394,7 +394,7 @@
break;
}
sprintf(str, "{fd=%d, revents=", fds.fd);
- flagstr=sprintflags("", pollflags, fds.revents);
+ flagstr = sprintflags("", pollflags, fds.revents);
cumlen += strlen(str) + strlen(flagstr) + 1;
if (cumlen < sizeof(outstr)) {
strcat(outstr, str);
@@ -560,7 +560,7 @@
{ 0, NULL },
};
-static const struct xlat transport_user_flags [] = {
+static const struct xlat transport_user_flags[] = {
{ 0, "0" },
{ T_MORE, "T_MORE" },
{ T_EXPEDITED, "T_EXPEDITED" },
@@ -579,12 +579,12 @@
#ifdef HAVE_STRUCT_T_OPTHDR
-static const struct xlat xti_level [] = {
+static const struct xlat xti_level[] = {
{ XTI_GENERIC, "XTI_GENERIC" },
{ 0, NULL },
};
-static const struct xlat xti_generic [] = {
+static const struct xlat xti_generic[] = {
{ XTI_DEBUG, "XTI_DEBUG" },
{ XTI_LINGER, "XTI_LINGER" },
{ XTI_RCVBUF, "XTI_RCVBUF" },
@@ -605,43 +605,43 @@
while (len >= (int) sizeof hdr) {
if (umove(tcp, addr, &hdr) < 0) break;
if (c++) {
- tprintf (", ");
+ tprintf(", ");
}
else if (len > hdr.len + sizeof hdr) {
- tprintf ("[");
+ tprintf("[");
}
- tprintf ("{level=");
- printxval (xti_level, hdr.level, "???");
- tprintf (", name=");
+ tprintf("{level=");
+ printxval(xti_level, hdr.level, "???");
+ tprintf(", name=");
switch (hdr.level) {
case XTI_GENERIC:
- printxval (xti_generic, hdr.name, "XTI_???");
+ printxval(xti_generic, hdr.name, "XTI_???");
break;
default:
- tprintf ("%ld", hdr.name);
+ tprintf("%ld", hdr.name);
break;
}
- tprintf (", status=");
- printxval (transport_user_flags, hdr.status, "T_???");
+ tprintf(", status=");
+ printxval(transport_user_flags, hdr.status, "T_???");
addr += sizeof hdr;
len -= sizeof hdr;
if ((hdr.len -= sizeof hdr) > 0) {
if (hdr.len > len) break;
- tprintf (", val=");
- if (len == sizeof (int))
- printnum (tcp, addr, "%d");
+ tprintf(", val=");
+ if (len == sizeof(int))
+ printnum(tcp, addr, "%d");
else
- printstr (tcp, addr, hdr.len);
+ printstr(tcp, addr, hdr.len);
addr += hdr.len;
len -= hdr.len;
}
- tprintf ("}");
+ tprintf("}");
}
if (len > 0) {
- if (c++) tprintf (", ");
- printstr (tcp, addr, len);
+ if (c++) tprintf(", ");
+ printstr(tcp, addr, len);
}
- if (c > 1) tprintf ("]");
+ if (c > 1) tprintf("]");
}
#endif
@@ -653,25 +653,25 @@
/* We don't know how to tell if TLI (socket) or XTI
optmgmt is being used yet, assume TLI. */
#if defined (HAVE_STRUCT_OPTHDR)
- print_sock_optmgmt (tcp, addr, len);
+ print_sock_optmgmt(tcp, addr, len);
#elif defined (HAVE_STRUCT_T_OPTHDR)
- print_xti_optmgmt (tcp, addr, len);
+ print_xti_optmgmt(tcp, addr, len);
#else
- printstr (tcp, addr, len);
+ printstr(tcp, addr, len);
#endif
}
-static const struct xlat service_type [] = {
+static const struct xlat service_type[] = {
{ T_COTS, "T_COTS" },
{ T_COTS_ORD, "T_COTS_ORD" },
{ T_CLTS, "T_CLTS" },
{ 0, NULL },
};
-static const struct xlat ts_state [] = {
+static const struct xlat ts_state[] = {
{ TS_UNBND, "TS_UNBND" },
{ TS_WACK_BREQ, "TS_WACK_BREQ" },
{ TS_WACK_UREQ, "TS_WACK_UREQ" },
@@ -692,7 +692,7 @@
{ 0, NULL },
};
-static const struct xlat provider_flags [] = {
+static const struct xlat provider_flags[] = {
{ 0, "0" },
{ SENDZERO, "SENDZERO" },
{ EXPINLINE, "EXPINLINE" },
@@ -701,7 +701,7 @@
};
-static const struct xlat tli_errors [] = {
+static const struct xlat tli_errors[] = {
{ TBADADDR, "TBADADDR" },
{ TBADOPT, "TBADOPT" },
{ TACCES, "TACCES" },
@@ -743,93 +743,93 @@
if (len < sizeof m.type) goto dump;
- if (umove (tcp, addr, &m.type) < 0) goto dump;
+ if (umove(tcp, addr, &m.type) < 0) goto dump;
#define GET(type, struct) \
do { \
if (len < sizeof m.struct) goto dump; \
- if (umove (tcp, addr, &m.struct) < 0) goto dump;\
- tprintf ("{"); \
+ if (umove(tcp, addr, &m.struct) < 0) goto dump;\
+ tprintf("{"); \
if (expect != type) { \
++c; \
- tprintf (#type); \
+ tprintf(#type); \
} \
} \
while (0)
#define COMMA() \
- do { if (c++) tprintf (", "); } while (0)
+ do { if (c++) tprintf(", "); } while (0)
#define STRUCT(struct, elem, print) \
do { \
- COMMA (); \
+ COMMA(); \
if (m.struct.elem##_length < 0 || \
m.struct.elem##_offset < sizeof m.struct || \
m.struct.elem##_offset + m.struct.elem##_length > len) \
{ \
- tprintf (#elem "_length=%ld, " #elem "_offset=%ld",\
+ tprintf(#elem "_length=%ld, " #elem "_offset=%ld",\
m.struct.elem##_length, \
m.struct.elem##_offset); \
} \
else { \
- tprintf (#elem "="); \
- print (tcp, \
+ tprintf(#elem "="); \
+ print(tcp, \
addr + m.struct.elem##_offset, \
m.struct.elem##_length); \
} \
} \
while (0)
-#define ADDR(struct, elem) STRUCT (struct, elem, printstr)
+#define ADDR(struct, elem) STRUCT(struct, elem, printstr)
switch (m.type) {
#ifdef T_CONN_REQ
case T_CONN_REQ: /* connect request */
- GET (T_CONN_REQ, conn_req);
- ADDR (conn_req, DEST);
- ADDR (conn_req, OPT);
+ GET(T_CONN_REQ, conn_req);
+ ADDR(conn_req, DEST);
+ ADDR(conn_req, OPT);
break;
#endif
#ifdef T_CONN_RES
case T_CONN_RES: /* connect response */
- GET (T_CONN_RES, conn_res);
+ GET(T_CONN_RES, conn_res);
#ifdef HAVE_STRUCT_T_CONN_RES_QUEUE_PTR
- COMMA ();
- tprintf ("QUEUE=%p", m.conn_res.QUEUE_ptr);
+ COMMA();
+ tprintf("QUEUE=%p", m.conn_res.QUEUE_ptr);
#elif defined HAVE_STRUCT_T_CONN_RES_ACCEPTOR_ID
- COMMA ();
- tprintf ("ACCEPTOR=%#lx", m.conn_res.ACCEPTOR_id);
+ COMMA();
+ tprintf("ACCEPTOR=%#lx", m.conn_res.ACCEPTOR_id);
#endif
- ADDR (conn_res, OPT);
- COMMA ();
- tprintf ("SEQ=%ld", m.conn_res.SEQ_number);
+ ADDR(conn_res, OPT);
+ COMMA();
+ tprintf("SEQ=%ld", m.conn_res.SEQ_number);
break;
#endif
#ifdef T_DISCON_REQ
case T_DISCON_REQ: /* disconnect request */
- GET (T_DISCON_REQ, discon_req);
- COMMA ();
- tprintf ("SEQ=%ld", m.discon_req.SEQ_number);
+ GET(T_DISCON_REQ, discon_req);
+ COMMA();
+ tprintf("SEQ=%ld", m.discon_req.SEQ_number);
break;
#endif
#ifdef T_DATA_REQ
case T_DATA_REQ: /* data request */
- GET (T_DATA_REQ, data_req);
- COMMA ();
- tprintf ("MORE=%ld", m.data_req.MORE_flag);
+ GET(T_DATA_REQ, data_req);
+ COMMA();
+ tprintf("MORE=%ld", m.data_req.MORE_flag);
break;
#endif
#ifdef T_EXDATA_REQ
case T_EXDATA_REQ: /* expedited data req */
- GET (T_EXDATA_REQ, exdata_req);
- COMMA ();
- tprintf ("MORE=%ld", m.exdata_req.MORE_flag);
+ GET(T_EXDATA_REQ, exdata_req);
+ COMMA();
+ tprintf("MORE=%ld", m.exdata_req.MORE_flag);
break;
#endif
#ifdef T_INFO_REQ
case T_INFO_REQ: /* information req */
- GET (T_INFO_REQ, info_req);
+ GET(T_INFO_REQ, info_req);
break;
#endif
#ifdef T_BIND_REQ
@@ -837,161 +837,161 @@
#ifdef O_T_BIND_REQ
case O_T_BIND_REQ: /* Ugly xti/tli hack */
#endif
- GET (T_BIND_REQ, bind_req);
- ADDR (bind_req, ADDR);
- COMMA ();
- tprintf ("CONIND=%ld", m.bind_req.CONIND_number);
+ GET(T_BIND_REQ, bind_req);
+ ADDR(bind_req, ADDR);
+ COMMA();
+ tprintf("CONIND=%ld", m.bind_req.CONIND_number);
break;
#endif
#ifdef T_UNBIND_REQ
case T_UNBIND_REQ: /* unbind request */
- GET (T_UNBIND_REQ, unbind_req);
+ GET(T_UNBIND_REQ, unbind_req);
break;
#endif
#ifdef T_UNITDATA_REQ
case T_UNITDATA_REQ: /* unitdata requset */
- GET (T_UNITDATA_REQ, unitdata_req);
- ADDR (unitdata_req, DEST);
- ADDR (unitdata_req, OPT);
+ GET(T_UNITDATA_REQ, unitdata_req);
+ ADDR(unitdata_req, DEST);
+ ADDR(unitdata_req, OPT);
break;
#endif
#ifdef T_OPTMGMT_REQ
case T_OPTMGMT_REQ: /* manage opt req */
- GET (T_OPTMGMT_REQ, optmgmt_req);
- COMMA ();
- tprintf ("MGMT=");
- printflags (transport_user_flags, m.optmgmt_req.MGMT_flags,
+ GET(T_OPTMGMT_REQ, optmgmt_req);
+ COMMA();
+ tprintf("MGMT=");
+ printflags(transport_user_flags, m.optmgmt_req.MGMT_flags,
"T_???");
- STRUCT (optmgmt_req, OPT, print_optmgmt);
+ STRUCT(optmgmt_req, OPT, print_optmgmt);
break;
#endif
#ifdef T_ORDREL_REQ
case T_ORDREL_REQ: /* orderly rel req */
- GET (T_ORDREL_REQ, ordrel_req);
+ GET(T_ORDREL_REQ, ordrel_req);
break;
#endif
#ifdef T_CONN_IND
case T_CONN_IND: /* connect indication */
- GET (T_CONN_IND, conn_ind);
- ADDR (conn_ind, SRC);
- ADDR (conn_ind, OPT);
- tprintf (", SEQ=%ld", m.conn_ind.SEQ_number);
+ GET(T_CONN_IND, conn_ind);
+ ADDR(conn_ind, SRC);
+ ADDR(conn_ind, OPT);
+ tprintf(", SEQ=%ld", m.conn_ind.SEQ_number);
break;
#endif
#ifdef T_CONN_CON
case T_CONN_CON: /* connect corfirm */
- GET (T_CONN_CON, conn_con);
- ADDR (conn_con, RES);
- ADDR (conn_con, OPT);
+ GET(T_CONN_CON, conn_con);
+ ADDR(conn_con, RES);
+ ADDR(conn_con, OPT);
break;
#endif
#ifdef T_DISCON_IND
case T_DISCON_IND: /* discon indication */
- GET (T_DISCON_IND, discon_ind);
- COMMA ();
- tprintf ("DISCON=%ld, SEQ=%ld",
+ GET(T_DISCON_IND, discon_ind);
+ COMMA();
+ tprintf("DISCON=%ld, SEQ=%ld",
m.discon_ind.DISCON_reason, m.discon_ind.SEQ_number);
break;
#endif
#ifdef T_DATA_IND
case T_DATA_IND: /* data indication */
- GET (T_DATA_IND, data_ind);
- COMMA ();
- tprintf ("MORE=%ld", m.data_ind.MORE_flag);
+ GET(T_DATA_IND, data_ind);
+ COMMA();
+ tprintf("MORE=%ld", m.data_ind.MORE_flag);
break;
#endif
#ifdef T_EXDATA_IND
case T_EXDATA_IND: /* expedited data ind */
- GET (T_EXDATA_IND, exdata_ind);
- COMMA ();
- tprintf ("MORE=%ld", m.exdata_ind.MORE_flag);
+ GET(T_EXDATA_IND, exdata_ind);
+ COMMA();
+ tprintf("MORE=%ld", m.exdata_ind.MORE_flag);
break;
#endif
#ifdef T_INFO_ACK
case T_INFO_ACK: /* info ack */
- GET (T_INFO_ACK, info_ack);
- COMMA ();
- tprintf ("TSDU=%ld, ETSDU=%ld, CDATA=%ld, DDATA=%ld, "
+ GET(T_INFO_ACK, info_ack);
+ COMMA();
+ tprintf("TSDU=%ld, ETSDU=%ld, CDATA=%ld, DDATA=%ld, "
"ADDR=%ld, OPT=%ld, TIDU=%ld, SERV=",
m.info_ack.TSDU_size, m.info_ack.ETSDU_size,
m.info_ack.CDATA_size, m.info_ack.DDATA_size,
m.info_ack.ADDR_size, m.info_ack.OPT_size,
m.info_ack.TIDU_size);
- printxval (service_type, m.info_ack.SERV_type, "T_???");
- tprintf (", CURRENT=");
- printxval (ts_state, m.info_ack.CURRENT_state, "TS_???");
- tprintf (", PROVIDER=");
- printflags (provider_flags, m.info_ack.PROVIDER_flag, "???");
+ printxval(service_type, m.info_ack.SERV_type, "T_???");
+ tprintf(", CURRENT=");
+ printxval(ts_state, m.info_ack.CURRENT_state, "TS_???");
+ tprintf(", PROVIDER=");
+ printflags(provider_flags, m.info_ack.PROVIDER_flag, "???");
break;
#endif
#ifdef T_BIND_ACK
case T_BIND_ACK: /* bind ack */
- GET (T_BIND_ACK, bind_ack);
- ADDR (bind_ack, ADDR);
- tprintf (", CONIND=%ld", m.bind_ack.CONIND_number);
+ GET(T_BIND_ACK, bind_ack);
+ ADDR(bind_ack, ADDR);
+ tprintf(", CONIND=%ld", m.bind_ack.CONIND_number);
break;
#endif
#ifdef T_ERROR_ACK
case T_ERROR_ACK: /* error ack */
- GET (T_ERROR_ACK, error_ack);
- COMMA ();
- tprintf ("ERROR=");
- printxval (transport_user_options,
+ GET(T_ERROR_ACK, error_ack);
+ COMMA();
+ tprintf("ERROR=");
+ printxval(transport_user_options,
m.error_ack.ERROR_prim, "TI_???");
- tprintf (", TLI=");
- printxval (tli_errors, m.error_ack.TLI_error, "T???");
- tprintf ("UNIX=%s", strerror (m.error_ack.UNIX_error));
+ tprintf(", TLI=");
+ printxval(tli_errors, m.error_ack.TLI_error, "T???");
+ tprintf("UNIX=%s", strerror(m.error_ack.UNIX_error));
break;
#endif
#ifdef T_OK_ACK
case T_OK_ACK: /* ok ack */
- GET (T_OK_ACK, ok_ack);
- COMMA ();
- tprintf ("CORRECT=");
- printxval (transport_user_options,
+ GET(T_OK_ACK, ok_ack);
+ COMMA();
+ tprintf("CORRECT=");
+ printxval(transport_user_options,
m.ok_ack.CORRECT_prim, "TI_???");
break;
#endif
#ifdef T_UNITDATA_IND
case T_UNITDATA_IND: /* unitdata ind */
- GET (T_UNITDATA_IND, unitdata_ind);
- ADDR (unitdata_ind, SRC);
- ADDR (unitdata_ind, OPT);
+ GET(T_UNITDATA_IND, unitdata_ind);
+ ADDR(unitdata_ind, SRC);
+ ADDR(unitdata_ind, OPT);
break;
#endif
#ifdef T_UDERROR_IND
case T_UDERROR_IND: /* unitdata error ind */
- GET (T_UDERROR_IND, uderror_ind);
- ADDR (uderror_ind, DEST);
- ADDR (uderror_ind, OPT);
- tprintf (", ERROR=%ld", m.uderror_ind.ERROR_type);
+ GET(T_UDERROR_IND, uderror_ind);
+ ADDR(uderror_ind, DEST);
+ ADDR(uderror_ind, OPT);
+ tprintf(", ERROR=%ld", m.uderror_ind.ERROR_type);
break;
#endif
#ifdef T_OPTMGMT_ACK
case T_OPTMGMT_ACK: /* manage opt ack */
- GET (T_OPTMGMT_ACK, optmgmt_ack);
- COMMA ();
- tprintf ("MGMT=");
- printflags (transport_user_flags, m.optmgmt_ack.MGMT_flags,
+ GET(T_OPTMGMT_ACK, optmgmt_ack);
+ COMMA();
+ tprintf("MGMT=");
+ printflags(transport_user_flags, m.optmgmt_ack.MGMT_flags,
"T_???");
- STRUCT (optmgmt_ack, OPT, print_optmgmt);
+ STRUCT(optmgmt_ack, OPT, print_optmgmt);
break;
#endif
#ifdef T_ORDREL_IND
case T_ORDREL_IND: /* orderly rel ind */
- GET (T_ORDREL_IND, ordrel_ind);
+ GET(T_ORDREL_IND, ordrel_ind);
break;
#endif
#ifdef T_ADDR_REQ
case T_ADDR_REQ: /* address req */
- GET (T_ADDR_REQ, addr_req);
+ GET(T_ADDR_REQ, addr_req);
break;
#endif
#ifdef T_ADDR_ACK
case T_ADDR_ACK: /* address response */
- GET (T_ADDR_ACK, addr_ack);
- ADDR (addr_ack, LOCADDR);
- ADDR (addr_ack, REMADDR);
+ GET(T_ADDR_ACK, addr_ack);
+ ADDR(addr_ack, LOCADDR);
+ ADDR(addr_ack, REMADDR);
break;
#endif
default:
@@ -1001,7 +1001,7 @@
break;
}
- if (c >= 0) tprintf ("}");
+ if (c >= 0) tprintf("}");
#undef ADDR
#undef COMMA
@@ -1066,12 +1066,12 @@
/* in T_BIND_REQ, out T_BIND_ACK */
++timod;
if (entering(tcp)) {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_BIND_REQ,
si.ic_dp, si.ic_len);
}
else {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_BIND_ACK,
si.ic_dp, si.ic_len);
}
@@ -1082,12 +1082,12 @@
/* in T_UNBIND_REQ, out T_OK_ACK */
++timod;
if (entering(tcp)) {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_UNBIND_REQ,
si.ic_dp, si.ic_len);
}
else {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_OK_ACK,
si.ic_dp, si.ic_len);
}
@@ -1098,12 +1098,12 @@
/* in T_INFO_REQ, out T_INFO_ACK */
++timod;
if (entering(tcp)) {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_INFO_REQ,
si.ic_dp, si.ic_len);
}
else {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_INFO_ACK,
si.ic_dp, si.ic_len);
}
@@ -1114,12 +1114,12 @@
/* in T_OPTMGMT_REQ, out T_OPTMGMT_ACK */
++timod;
if (entering(tcp)) {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_OPTMGMT_REQ,
si.ic_dp, si.ic_len);
}
else {
- print_transport_message (tcp,
+ print_transport_message(tcp,
T_OPTMGMT_ACK,
si.ic_dp, si.ic_len);
}
@@ -1150,7 +1150,7 @@
if (exiting(tcp)) {
tprintf("}");
if (timod && tcp->u_rval && !syserror(tcp)) {
- tcp->auxstr = xlookup (tli_errors, tcp->u_rval);
+ tcp->auxstr = xlookup(tli_errors, tcp->u_rval);
return RVAL_STR + 1;
}
}