chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: more general error message formatting
[disorder]
/
lib
/
queue.c
diff --git
a/lib/queue.c
b/lib/queue.c
index e39ca5f3f92fb36c28429bdb0fb74335833d9036..789d2eaa7120581824ee16ef55ee3c0e6cc59f86 100644
(file)
--- a/
lib/queue.c
+++ b/
lib/queue.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* 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
*
* 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
@@
-77,8
+77,9
@@
static int unmarshall_long(char *data, struct queue_entry *q,
size_t offset,
void (*error_handler)(const char *, void *),
void *u) {
size_t offset,
void (*error_handler)(const char *, void *),
void *u) {
+ char errbuf[1024];
if(xstrtol(&VALUE(q, offset, long), data, 0, 0)) {
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 -1;
}
return 0;
@@
-123,9
+124,10
@@
static int unmarshall_time_t(char *data, struct queue_entry *q,
void (*error_handler)(const char *, void *),
void *u) {
long_long ul;
void (*error_handler)(const char *, void *),
void *u) {
long_long ul;
+ char errbuf[1024];
if(xstrtoll(&ul, data, 0, 0)) {
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 -1;
}
VALUE(q, offset, time_t) = ul;