Function-style macros are the devil.  But I guess I'll still use them.
@@ -88,24 +88,24 @@ dumpAddrs(int sd, enum control_type_t endp)
}
}
-#define DATA_FIELD(val) STRFIELD("data", val, 1)
-#define UNIT_FIELD(val) STRFIELD("unit", val, 1)
-#define CLASS_FIELD(val) STRFIELD("class", val, 2)
-#define PROTO_FIELD(val) STRFIELD("proto", val, 2)
-#define OP_FIELD(val) STRFIELD("op", val, 3)
-#define HOST_FIELD(val) STRFIELD("host", val, 4)
-#define PROC_FIELD(val) STRFIELD("proc", val, 4)
-#define DOMAIN_FIELD(val) STRFIELD("domain", val, 5)
-#define FILE_FIELD(val) STRFIELD("file", val, 5)
-#define LOCALIP_FIELD(val) STRFIELD("localip", val, 6)
-#define REMOTEIP_FIELD(val) STRFIELD("remoteip", val, 6)
-#define LOCALP_FIELD(val) NUMFIELD("localp", val, 6)
-#define PORT_FIELD(val) NUMFIELD("port", val, 6)
-#define REMOTEP_FIELD(val) NUMFIELD("remotep", val, 6)
-#define FD_FIELD(val) NUMFIELD("fd", val, 7)
-#define PID_FIELD(val) NUMFIELD("pid", val, 7)
-#define DURATION_FIELD(val) NUMFIELD("duration", val, 8)
-#define NUMOPS_FIELD(val) NUMFIELD("numops", val, 8)
+#define DATA_FIELD(val) STRFIELD("data", (val), 1)
+#define UNIT_FIELD(val) STRFIELD("unit", (val), 1)
+#define CLASS_FIELD(val) STRFIELD("class", (val), 2)
+#define PROTO_FIELD(val) STRFIELD("proto", (val), 2)
+#define OP_FIELD(val) STRFIELD("op", (val), 3)
+#define HOST_FIELD(val) STRFIELD("host", (val), 4)
+#define PROC_FIELD(val) STRFIELD("proc", (val), 4)
+#define DOMAIN_FIELD(val) STRFIELD("domain", (val), 5)
+#define FILE_FIELD(val) STRFIELD("file", (val), 5)
+#define LOCALIP_FIELD(val) STRFIELD("localip", (val), 6)
+#define REMOTEIP_FIELD(val) STRFIELD("remoteip", (val), 6)
+#define LOCALP_FIELD(val) NUMFIELD("localp", (val), 6)
+#define PORT_FIELD(val) NUMFIELD("port", (val), 6)
+#define REMOTEP_FIELD(val) NUMFIELD("remotep", (val), 6)
+#define FD_FIELD(val) NUMFIELD("fd", (val), 7)
+#define PID_FIELD(val) NUMFIELD("pid", (val), 7)
+#define DURATION_FIELD(val) NUMFIELD("duration", (val), 8)
+#define NUMOPS_FIELD(val) NUMFIELD("numops", (val), 8)
static void
setVerbosity(rtconfig* c, unsigned verbosity)
