diff options
| author | mux <mux@FreeBSD.org> | 2006-03-03 18:45:12 +0000 |
|---|---|---|
| committer | mux <mux@FreeBSD.org> | 2006-03-03 18:45:12 +0000 |
| commit | ee502b391a6ea125df9667edff93bff1ed8ca7f8 (patch) | |
| tree | 796f7fb8ae0b4d05b4163955ec6a845444ea2e34 /contrib | |
| parent | 049103350d61f84f27d49de458b2002a10a62f2a (diff) | |
| parent | dcd260f19108b1581242296d1dfa1a9bf429676b (diff) | |
| download | FreeBSD-src-ee502b391a6ea125df9667edff93bff1ed8ca7f8.zip FreeBSD-src-ee502b391a6ea125df9667edff93bff1ed8ca7f8.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r156251,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/csup/misc.c | 2 | ||||
| -rw-r--r-- | contrib/csup/queue.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/csup/misc.c b/contrib/csup/misc.c index ff9403e..b97a542 100644 --- a/contrib/csup/misc.c +++ b/contrib/csup/misc.c @@ -204,7 +204,7 @@ rcsdatetotm(const char *revdate, struct tm *tm) if (cp == NULL) return (-1); len = cp - revdate; - if (len == 4) + if (len >= 4) cp = strptime(revdate, "%Y.%m.%d.%H.%M.%S", tm); else if (len == 2) cp = strptime(revdate, "%y.%m.%d.%H.%M.%S", tm); diff --git a/contrib/csup/queue.h b/contrib/csup/queue.h index 369c013..7ae77bc 100644 --- a/contrib/csup/queue.h +++ b/contrib/csup/queue.h @@ -107,7 +107,7 @@ struct { \ #define STAILQ_LAST(head, type, field) \ (STAILQ_EMPTY((head)) ? \ NULL : \ - ((struct type *) \ + ((struct type *)(void *) \ ((char *)((head)->stqh_last) - __offsetof(struct type, field)))) #undef STAILQ_NEXT |
