#include "syscalls.h"
#include "table.h"
#include "printf.h"
+#include "vector.h"
const char *const playing_states[] = {
"failed",
n = byte_snprintf(buffer, sizeof buffer, "%ld", VALUE(q, offset, long));
if(n < 0)
- fatal(errno, "error converting int");
+ disorder_fatal(errno, "error converting int");
else if((size_t)n >= sizeof buffer)
- fatal(0, "long converted to decimal is too long");
+ disorder_fatal(0, "long converted to decimal is too long");
return xstrdup(buffer);
}
+static void free_none(struct queue_entry attribute((unused)) *q,
+ size_t attribute((unused)) offset) {
+}
+
+#define free_long free_none
+
static int unmarshall_string(char *data, struct queue_entry *q,
size_t offset,
void attribute((unused)) (*error_handler)(const char *, void *),
void attribute((unused)) *u) {
- VALUE(q, offset, char *) = data;
+ VALUE(q, offset, char *) = xstrdup(data);
return 0;
}
return VALUE(q, offset, char *);
}
+static void free_string(struct queue_entry *q, size_t offset) {
+ xfree(VALUE(q, offset, char *));
+}
+
static int unmarshall_time_t(char *data, struct queue_entry *q,
size_t offset,
void (*error_handler)(const char *, void *),
n = byte_snprintf(buffer, sizeof buffer,
"%"PRIdMAX, (intmax_t)VALUE(q, offset, time_t));
if(n < 0)
- fatal(errno, "error converting time");
+ disorder_fatal(errno, "error converting time");
else if((size_t)n >= sizeof buffer)
- fatal(0, "time converted to decimal is too long");
+ disorder_fatal(0, "time converted to decimal is too long");
return xstrdup(buffer);
}
+#define free_time_t free_none
+
static int unmarshall_state(char *data, struct queue_entry *q,
size_t offset,
void (*error_handler)(const char *, void *),
return track_origins[VALUE(q, offset, enum track_origin)];
}
-#define F(n, h) { #n, offsetof(struct queue_entry, n), marshall_##h, unmarshall_##h }
+#define free_state free_none
+#define free_origin free_none
+
+#define F(n, h) { #n, offsetof(struct queue_entry, n), marshall_##h, unmarshall_##h, free_##h }
static const struct field {
const char *name;
int (*unmarshall)(char *data, struct queue_entry *q, size_t offset,
void (*error_handler)(const char *, void *),
void *u);
+ void (*free)(struct queue_entry *q, size_t offset);
} fields[] = {
/* Keep this table sorted. */
F(expected, time_t),
F(when, time_t),
F(wstat, long)
};
+#define NFIELDS (sizeof fields / sizeof *fields)
int queue_unmarshall(struct queue_entry *q, const char *s,
void (*error_handler)(const char *, void *),
q->pid = -1; /* =none */
if(!(vec = split(s, &nvec, SPLIT_QUOTES, error_handler, u)))
return -1;
- return queue_unmarshall_vec(q, nvec, vec, error_handler, u);
+ int rc = queue_unmarshall_vec(q, nvec, vec, error_handler, u);
+ free_strings(nvec, vec);
+ return rc;
}
int queue_unmarshall_vec(struct queue_entry *q, int nvec, char **vec,
return r;
}
+void queue_free(struct queue_entry *q, int rest) {
+ if(!q)
+ return;
+ if(rest)
+ queue_free(q->next, rest);
+ for(unsigned n = 0; n < NFIELDS; ++n)
+ fields[n].free(q, fields[n].offset);
+ xfree(q);
+}
+
/*
Local Variables:
c-basic-offset:2