/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-2009, 2011, 2013 Richard Kettlewell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "syscalls.h"
#include "table.h"
#include "printf.h"
+#include "vector.h"
const char *const playing_states[] = {
"failed",
size_t offset,
void (*error_handler)(const char *, void *),
void *u) {
+ char errbuf[1024];
if(xstrtol(&VALUE(q, offset, long), data, 0, 0)) {
- error_handler(strerror(errno), u);
+ error_handler(format_error(ec_errno, errno, errbuf, sizeof errbuf), u);
return -1;
}
return 0;
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 *),
void *u) {
long_long ul;
+ char errbuf[1024];
if(xstrtoll(&ul, data, 0, 0)) {
- error_handler(strerror(errno), u);
+ error_handler(format_error(ec_errno, errno, errbuf, sizeof errbuf), u);
return -1;
}
VALUE(q, offset, time_t) = ul;
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 {
+/** @brief A field in a @ref queue_entry */
+static const struct queue_field {
+ /** @brief Field name */
const char *name;
+
+ /** @brief Offset of value in @ref queue_entry structure */
size_t offset;
+
+ /** @brief Marshaling function */
const char *(*marshall)(const struct queue_entry *q, size_t offset);
+
+ /** @brief Unmarshaling function */
int (*unmarshall)(char *data, struct queue_entry *q, size_t offset,
void (*error_handler)(const char *, void *),
void *u);
+
+ /** @brief Destructor */
+ 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 *),
void *u) {
char **vec;
- int nvec;
+ int nvec, rc;
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);
+ 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) {
+ unsigned n;
+ if(!q)
+ return;
+ if(rest)
+ queue_free(q->next, rest);
+ for(n = 0; n < NFIELDS; ++n)
+ fields[n].free(q, fields[n].offset);
+ xfree(q);
+}
+
/*
Local Variables:
c-basic-offset:2