summaryrefslogtreecommitdiff
path: root/libguile/stime.c
diff options
context:
space:
mode:
authorGreg J. Badros <gjb@cs.washington.edu>1999-12-16 20:48:05 +0000
committerGreg J. Badros <gjb@cs.washington.edu>1999-12-16 20:48:05 +0000
commit0c95b57d77efbe82bb0ade78df5d78d6d0f2a641 (patch)
tree4cd49dc6b94effdaed1476f397dc7c82d371b008 /libguile/stime.c
parent9c24ff3e6c28e7b9adc6b386ea0033e8a947c40e (diff)
downloadguile-0c95b57d77efbe82bb0ade78df5d78d6d0f2a641.tar.gz
* coop-threads.c: Remove K&R function headers.
* scm_validate.h: Added SCM_VALIDATE_THREAD. * *.c: Remove SCM_NIMP(X) when it is an extraneous pre-test given that SCM_FOOP macros all now include SCM_NIMP in their expansion. This simplifies lots of code, making it far more readable.
Diffstat (limited to 'libguile/stime.c')
-rw-r--r--libguile/stime.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libguile/stime.c b/libguile/stime.c
index e266d03eb..f3a0438c7 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -311,7 +311,7 @@ setzone (SCM zone, int pos, const char *subr)
char *buf;
/* if zone was supplied, set the environment temporarily. */
- SCM_ASSERT (SCM_NIMP (zone) && SCM_ROSTRINGP (zone), zone, pos, subr);
+ SCM_ASSERT (SCM_ROSTRINGP (zone), zone, pos, subr);
SCM_COERCE_SUBSTR (zone);
buf = scm_must_malloc (SCM_LENGTH (zone) + sizeof (tzvar) + 1,
subr);
@@ -436,7 +436,7 @@ bdtime2c (SCM sbd_time, struct tm *lt, int pos, const char *subr)
SCM *velts;
int i;
- SCM_ASSERT (SCM_NIMP (sbd_time) && SCM_VECTORP (sbd_time)
+ SCM_ASSERT (SCM_VECTORP (sbd_time)
&& SCM_LENGTH (sbd_time) == 11,
sbd_time, pos, subr);
velts = SCM_VELTS (sbd_time);
@@ -444,8 +444,7 @@ bdtime2c (SCM sbd_time, struct tm *lt, int pos, const char *subr)
{
SCM_ASSERT (SCM_INUMP (velts[i]), sbd_time, pos, subr);
}
- SCM_ASSERT (SCM_FALSEP (velts[10])
- || (SCM_NIMP (velts[10]) && SCM_STRINGP (velts[10])),
+ SCM_ASSERT (SCM_FALSEP (velts[10]) || SCM_STRINGP (velts[10]),
sbd_time, pos, subr);
lt->tm_sec = SCM_INUM (velts[0]);