whitespace, style

Signed-off-by: Daniel A. Steffen <[email protected]>

Author: das

src/io.c

@@ -1601,7 +1601,8 @@ _dispatch_disk_init(dispatch_fd_entry_t fd_entry, dev_t dev)
 	TAILQ_INIT(&disk->operations);
 	disk->cur_rq = TAILQ_FIRST(&disk->operations);
 	char label[45];
-	snprintf(label, sizeof(label), "com.apple.libdispatch-io.deviceq.%d", (int)dev);
+	snprintf(label, sizeof(label), "com.apple.libdispatch-io.deviceq.%d",
+			(int)dev);
 	disk->pick_queue = dispatch_queue_create(label, NULL);
 	TAILQ_INSERT_TAIL(&_dispatch_io_devs[hash], disk, disk_list);
 out:
@@ -2398,10 +2399,11 @@ _dispatch_operation_debug_attr(dispatch_operation_t op, char* buf,
 			"write", op->fd_entry ? op->fd_entry->fd : -1, op->fd_entry,
 			op->channel, op->op_q, oqtarget && oqtarget->dq_label ?
 			oqtarget->dq_label : "", oqtarget, target && target->dq_label ?
-			target->dq_label : "", target, (long long)op->offset, op->length, op->total,
-			op->undelivered + op->buf_len, op->flags, op->err, op->params.low,
-			op->params.high, op->params.interval_flags &
-			DISPATCH_IO_STRICT_INTERVAL ? "(strict)" : "", (unsigned long long)op->params.interval);
+			target->dq_label : "", target, (long long)op->offset, op->length,
+			op->total, op->undelivered + op->buf_len, op->flags, op->err,
+			op->params.low, op->params.high, op->params.interval_flags &
+			DISPATCH_IO_STRICT_INTERVAL ? "(strict)" : "",
+			(unsigned long long)op->params.interval);
 }
 
 size_t

src/source.c

@@ -148,7 +148,7 @@ dispatch_source_create(dispatch_source_type_t type,
 	dk->dk_kevent.ident = handle;
 	dk->dk_kevent.flags |= EV_ADD|EV_ENABLE;
 	dk->dk_kevent.fflags |= (uint32_t)mask;
-	dk->dk_kevent.udata = (typeof(dk->dk_kevent.udata))dk;
+	dk->dk_kevent.udata = (_dispatch_kevent_qos_udata_t)dk;
 	TAILQ_INIT(&dk->dk_sources);
 
 	ds->ds_dkev = dk;
@@ -917,9 +917,9 @@ _dispatch_kevent_init()
 	TAILQ_INSERT_TAIL(&_dispatch_sources[0],
 			&_dispatch_kevent_data_add, dk_list);
 	_dispatch_kevent_data_or.dk_kevent.udata =
-			(typeof(_dispatch_kevent_data_or.dk_kevent.udata))&_dispatch_kevent_data_or;
+			(_dispatch_kevent_qos_udata_t)&_dispatch_kevent_data_or;
 	_dispatch_kevent_data_add.dk_kevent.udata =
-			(typeof(_dispatch_kevent_data_or.dk_kevent.udata))&_dispatch_kevent_data_add;
+			(_dispatch_kevent_qos_udata_t)&_dispatch_kevent_data_add;
 #endif // !DISPATCH_USE_EV_UDATA_SPECIFIC
 }
 
@@ -1666,7 +1666,7 @@ _dispatch_timers_init(void)
 #ifndef __LP64__
 	unsigned int tidx;
 	for (tidx = 0; tidx < DISPATCH_TIMER_COUNT; tidx++) {
-		_dispatch_kevent_timer[tidx].dk_kevent.udata = \
+		_dispatch_kevent_timer[tidx].dk_kevent.udata =
 				DISPATCH_KEVENT_TIMER_UDATA(tidx);
 	}
 #endif // __LP64__
@@ -4760,11 +4760,12 @@ static size_t
 _dispatch_timer_debug_attr(dispatch_source_t ds, char* buf, size_t bufsiz)
 {
 	dispatch_source_refs_t dr = ds->ds_refs;
-	return dsnprintf(buf, bufsiz, "timer = { target = 0x%llx, deadline = 0x%llx,"
-			" last_fire = 0x%llx, interval = 0x%llx, flags = 0x%lx }, ",
-			(unsigned long long)ds_timer(dr).target, (unsigned long long)ds_timer(dr).deadline,
-			(unsigned long long)ds_timer(dr).last_fire, (unsigned long long)ds_timer(dr).interval,
-			ds_timer(dr).flags);
+	return dsnprintf(buf, bufsiz, "timer = { target = 0x%llx, deadline = 0x%llx"
+			", last_fire = 0x%llx, interval = 0x%llx, flags = 0x%lx }, ",
+			(unsigned long long)ds_timer(dr).target,
+			(unsigned long long)ds_timer(dr).deadline,
+			(unsigned long long)ds_timer(dr).last_fire,
+			(unsigned long long)ds_timer(dr).interval, ds_timer(dr).flags);
 }
 
 size_t

src/source_internal.h

@@ -108,6 +108,8 @@ struct dispatch_kevent_s {
 
 typedef struct dispatch_kevent_s *dispatch_kevent_t;
 
+typedef typeof(((dispatch_kevent_t)NULL)->dk_kevent.udata) _dispatch_kevent_qos_udata_t;
+
 struct dispatch_source_type_s {
 	_dispatch_kevent_qos_s ke;
 	uint64_t mask;