diff options
| author | Maxime Henrion <mux@FreeBSD.org> | 2006-03-03 18:45:12 +0000 |
|---|---|---|
| committer | Maxime Henrion <mux@FreeBSD.org> | 2006-03-03 18:45:12 +0000 |
| commit | 91be0d8ce36a3d2846486eb436ad4332e805009e (patch) | |
| tree | 562536dafdb622ad161913edd00e6ff8c8c1433b | |
| parent | bb215397eea295477c3d8b6a058590abba067a9f (diff) | |
Import today's csup sources to get the warning fix for queue.h. Wevendor/csup/20060303
probably want to do something similar in sys/queue.h; it's bad to have
STAILQ_LAST() generate GCC warnings.
Notes
Notes:
svn path=/vendor/csup/dist/; revision=156251
svn path=/vendor/csup/20060303/; revision=156253; tag=vendor/csup/20060303
| -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 ff9403e0c794..b97a54288036 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 369c013f7546..7ae77bcf0417 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 |