clisp-cvs Digest, Vol 18, Issue 5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Send clisp-cvs mailing list submissions to
	cli...@li...

To subscribe or unsubscribe via the World Wide Web, visit
	https://lists.sourceforge.net/lists/listinfo/clisp-cvs
or, via email, send a message with subject or body 'help' to
	cli...@li...

You can reach the person managing the list at
	cli...@li...

When replying, please edit your Subject line so it is more specific
than "Re: Contents of clisp-cvs digest..."


CLISP CVS commits for today

Today's Topics:

   1. clisp/src ChangeLog,1.5601,1.5602 lispbibl.d,1.722,1.723
      (Sam Steingold)
   2. clisp/src stream.d,1.581,1.582 ChangeLog,1.5602,1.5603
      (Sam Steingold)


----------------------------------------------------------------------

Message: 1
Date: Wed, 03 Oct 2007 01:24:47 +0000
From: Sam Steingold <sd...@us...>
Subject: clisp/src ChangeLog,1.5601,1.5602 lispbibl.d,1.722,1.723
To: cli...@li...
Message-ID: <E1I...@ma...>

Update of /cvsroot/clisp/clisp/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11837/src

Modified Files:
	ChangeLog lispbibl.d 
Log Message:
(off_to_I): define using sint??_to_I instead of [QL]_to_I because Q_to_I may not be defined on a 32-bit platform

Index: lispbibl.d
===================================================================
RCS file: /cvsroot/clisp/clisp/src/lispbibl.d,v
retrieving revision 1.722
retrieving revision 1.723
diff -u -d -r1.722 -r1.723

--- lispbibl.d	2 Oct 2007 21:11:24 -0000	1.722
+++ lispbibl.d	3 Oct 2007 01:24:44 -0000	1.723
@@ -16177,7 +16177,7 @@
 #if defined(intQsize) || (intVsize>32)
   #define uint64_to_I(val)  UQ_to_I((uint64)(val))
   #define sint64_to_I(val)  Q_to_I((sint64)(val))
-#elif defined(HAVE_FFI)
+#else
   #define uint64_to_I(val)  UL2_to_I((uint32)((val)>>32),(uint32)(val))
   #define sint64_to_I(val)  L2_to_I((sint32)((val)>>32),(uint32)(val))
 #endif
@@ -16227,9 +16227,9 @@
 #if defined(WIN32_NATIVE)
   #define off_to_I(val)  L2_to_I((sint32)((val)>>32),(uint32)(val))
 #elif SIZEOF_OFF_T > 4
-  #define off_to_I  Q_to_I
+  #define off_to_I  sint64_to_I
 #else
-  #define off_to_I  L_to_I
+  #define off_to_I  sint32_to_I
 #endif
 
 # Converts an Integer >=0 into an unsigned longword.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v
retrieving revision 1.5601
retrieving revision 1.5602
diff -u -d -r1.5601 -r1.5602
--- ChangeLog	2 Oct 2007 22:20:41 -0000	1.5601
+++ ChangeLog	3 Oct 2007 01:24:44 -0000	1.5602
@@ -6,6 +6,9 @@
 	is used by the gdbm module which does not have Lisp streams)
 	* genclisph.d (emit_to_I): add and use it for size, ssize and off
 	* lispbibl.d (handle_length): add declaration
+	(off_to_I): define using sint??_to_I instead of [QL]_to_I because
+	Q_to_I may not be defined on a 32-bit platform
+	(uint64_to_I, sint64_to_I): always define
 	* stream.d (handle_length): implement
 	(FILE-LENGTH): use it to handle unbuffered streams
 	(FILE-POSITION): use handle_lseek on unbuffered streams




------------------------------

Message: 2
Date: Wed, 03 Oct 2007 02:04:02 +0000
From: Sam Steingold <sd...@us...>
Subject: clisp/src stream.d,1.581,1.582 ChangeLog,1.5602,1.5603
To: cli...@li...
Message-ID: <E1I...@ma...>

Update of /cvsroot/clisp/clisp/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27141/src

Modified Files:
	stream.d ChangeLog 
Log Message:
(fd_lseek): extract from handle_lseek
(handle_lseek): use it


Index: stream.d
===================================================================
RCS file: /cvsroot/clisp/clisp/src/stream.d,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -d -r1.581 -r1.582
--- stream.d	3 Oct 2007 01:23:58 -0000	1.581
+++ stream.d	3 Oct 2007 02:03:59 -0000	1.582
@@ -6007,12 +6007,14 @@
 #         SEEK_END  "at the end"
 # < result: new Position
 #if defined(UNIX) || defined(WIN32_NATIVE)
-  #define handle_lseek(stream,handle,offset,mode,result_assignment)     \
-    { var off_t result = lseek(TheHandle(handle),offset,mode);          \
-      if (result<0) /* error occurred? */                               \
-        { end_system_call(); OS_filestream_error(stream); }             \
-      unused (result_assignment result);                                \
+  #define fd_lseek(stream,fd,offset,mode,result_assignment)    \
+    { var off_t result = lseek(fd,offset,mode);                \
+      if (result<0) /* error occurred? */                      \
+        { end_system_call(); OS_filestream_error(stream); }    \
+      unused (result_assignment result);                       \
     }
+  #define handle_lseek(stream,handle,offset,mode,result_assignment) \
+    fd_lseek(stream,TheHandle(handle),offset,mode,result_assignment)
 #endif
 
 /* UP: Fills the buffer, up to strm_buffered_bufflen bytes.
@@ -17202,14 +17204,14 @@
  for gdbm module */
 global off_t handle_length (object stream, Handle fd) {
   off_t len, pos;
-  handle_lseek(stream,fd,0,SEEK_CUR,pos=); /* save current location */
-  handle_lseek(stream,fd,0,SEEK_END,len=); /* get EOF location */
+  fd_lseek(stream,fd,0,SEEK_CUR,pos=); /* save current location */
+  fd_lseek(stream,fd,0,SEEK_END,len=); /* get EOF location */
   /* if the above call fails, we may be screwed now:
      the file position was modified but not restored.
      However, this would indicate a bug in the underlying lseek()
      implementation, see the list of ERRORS in
      http://www.opengroup.org/onlinepubs/009695399/functions/lseek.html */
-  handle_lseek(stream,fd,pos,SEEK_SET,); /* restore the original location */
+  fd_lseek(stream,fd,pos,SEEK_SET,); /* restore the original location */
   return len;
 }
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v
retrieving revision 1.5602
retrieving revision 1.5603
diff -u -d -r1.5602 -r1.5603
--- ChangeLog	3 Oct 2007 01:24:44 -0000	1.5602
+++ ChangeLog	3 Oct 2007 02:03:59 -0000	1.5603
@@ -10,6 +10,8 @@
 	Q_to_I may not be defined on a 32-bit platform
 	(uint64_to_I, sint64_to_I): always define
 	* stream.d (handle_length): implement
+	(fd_lseek): extract from handle_lseek
+	(handle_lseek): use it
 	(FILE-LENGTH): use it to handle unbuffered streams
 	(FILE-POSITION): use handle_lseek on unbuffered streams
 	* modules/gdbm/gdbm.c (GDBM:GDBM-FILE-SIZE): use handle_length




------------------------------

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/

------------------------------

_______________________________________________
clisp-cvs mailing list
cli...@li...
https://lists.sourceforge.net/lists/listinfo/clisp-cvs


End of clisp-cvs Digest, Vol 18, Issue 5
****************************************


